changelog and version

Author: Sigma88

Changelog.txt

@@ -1,12 +1,9 @@
-<<<<<<< HEAD
 **v1.5.0**
 
 - Updated to KSP 1.1 and Kopernicus 1.0
 - Fixed a bug that sometimes occurred while exiting the Primary SoI
 
 
-=======
->>>>>>> refs/remotes/origin/master
 **v1.4.9.2**
 
 - Fixed an issue with bodies using cbNameLater

GameData/Sigma/Binary/Sigma-Binary.version

@@ -1,5 +1 @@
-<<<<<<< HEAD
 {"NAME":"Sigma: Binary","URL":"http://ksp-avc.cybutek.net/version.php?id=188","DOWNLOAD":"http://forum.kerbalspaceprogram.com/threads/127820","CHANGE_LOG_URL":"https://github.com/Sigma88/Sigma-Binary/raw/master/Changelog.txt","VERSION":{"MAJOR":1,"MINOR":5,"PATCH":0,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":1,"PATCH":0}}
-=======
-{"NAME":"Sigma: Binary","URL":"http://ksp-avc.cybutek.net/version.php?id=188","DOWNLOAD":"http://forum.kerbalspaceprogram.com/threads/127820","CHANGE_LOG_URL":"https://github.com/Sigma88/Sigma-Binary/raw/master/Changelog.txt","VERSION":{"MAJOR":1,"MINOR":4,"PATCH":9,"BUILD":2},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}}
->>>>>>> refs/remotes/origin/master