1 files changed, 0 insertions, 3 deletions
diff --git a/COPYING b/COPYING
index 8b204f6..6244d87 100644
--- a/COPYING
+++ b/COPYING
@@ -825,11 +825,8 @@ Swift contains some code contributed under the BSD License, under the following
 --- START OF BSD LICENSE
 Copyright (c) 2011, Arnt Gulbrandsen
 Copyright (c) 2011, Thilo Cestonaro
-<<<<<<< HEAD
 Copyright (c) 2011, Vlad Voicu
-=======
 Copyright (c) 2011, Jan Kaluza
->>>>>>> swift-1.x
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: