Fix a stray git diff resolve line

leapmotion · Sep 27, 2016 · 0e89ab8 · 0e89ab8
1 parent aaca94d
commit 0e89ab8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/scripts/copyright_check.sh b/scripts/copyright_check.sh
@@ -6,7 +6,6 @@
 
 ENFORCED_FILES="examples src"
 COPYRIGHT_HEADER="// Copyright (C) 2012-2016 Leap Motion, Inc. All rights reserved."
->>>>>>> origin/master
 
 # Go to root directory
 for f in $(find $ENFORCED_FILES -name *.hpp -o -name *.cpp -o -name *.h);