Skip to content

Commit

Permalink
Fix licence headers
Browse files Browse the repository at this point in the history
  • Loading branch information
adrien-berchet committed Oct 19, 2020
1 parent 3216416 commit 94f72f2
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/cartopy/tests/test_img_tiles.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
# Copyright Cartopy Contributors
=======
# (C) British Crown Copyright 2011 - 2020, Met Office
>>>>>>> Fix licence headers
#
# This file is part of Cartopy and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
Expand Down

0 comments on commit 94f72f2

Please sign in to comment.