cleanup merge between ANGSD-wrapper/angsd-wrapper and mojaveazure/ang…

…sd-wrapper licence files
ANGSD-wrapper · Sep 28, 2018 · cb0ae96 · cb0ae96
1 parent 5c1e2d0
commit cb0ae96
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-MIT License
-
-Copyright (c) 2018 ANGSD-wrapper
-=======
 The MIT License (MIT)
 
 Copyright (c) 2015 Arun Durvasula
->>>>>>> angsd-wrapper/master
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal