summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-10-02 17:38:56 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-10-03 07:02:37 (GMT)
commit4ea336d9d124f1c761b22943eaf6771e16a61e58 (patch)
tree7bcb7ac4366cf31a2f98654a5859de0b32fb318a /COPYING
parent123502d97dc20357ea03fd7f238f117aeb2d05c3 (diff)
downloadswift-4ea336d9d124f1c761b22943eaf6771e16a61e58.zip
swift-4ea336d9d124f1c761b22943eaf6771e16a61e58.tar.bz2
Simple MUC invites.
Resolves: #152
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING3
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: