1 files changed, 4 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index a6e4bbb..8b204f6 100644
--- a/COPYING
+++ b/COPYING
@@ -825,7 +825,11 @@ 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: