Skip to content

Commit

Permalink
Merge branch 'master' into fix_histodb_forecastdiff
Browse files Browse the repository at this point in the history
  • Loading branch information
mathbagu committed Feb 24, 2017
2 parents efb8840 + 2461e10 commit 399f351
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion online-rest-api/src/test/resources/simplelogger.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017, Mathieu BAGUE <mathieu.bague@rte-france.com>
# Copyright (c) 2017, RTE (http://www.rte-france.com)
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Expand Down

0 comments on commit 399f351

Please sign in to comment.