squash

dboi88 · May 1, 2017 · 8347ece · 8347ece
1 parent 85c3112
commit 8347ece
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/FOR_RELEASE/GameData/CoyoteSpaceIndustries/Freighter/CSIFreighter.version b/FOR_RELEASE/GameData/CoyoteSpaceIndustries/Freighter/CSIFreighter.version
@@ -4,18 +4,8 @@
   "DOWNLOAD": "https://github.com/dboi88/CSI-Cargo-Freighter/releases",
   "VERSION": {
     "MAJOR": 0,
-<<<<<<< HEAD
-<<<<<<< HEAD
     "MINOR": 2,
     "PATCH": 0
-=======
-    "MINOR": 1,
-    "PATCH": 7
->>>>>>> origin/master
-=======
-    "MINOR": 2,
-    "PATCH": 0
->>>>>>> origin/master
   },
  "KSP_VERSION":{
 	 "MAJOR":1,

diff --git a/FOR_RELEASE/GameData/CoyoteSpaceIndustries/Freighter/Parts/Engine.cfg b/FOR_RELEASE/GameData/CoyoteSpaceIndustries/Freighter/Parts/Engine.cfg
@@ -30,20 +30,9 @@ PART
 	crashTolerance = 7
 	maxTemp = 2000 // = 3000
 	bulkheadProfiles = size3
-<<<<<<< HEAD
-<<<<<<< HEAD
-	breakingForce = 30000
-    breakingTorque = 30000
 	tags = cck-Coyote-Space-Industries-Freighter
-=======
-	breakingForce = 3000
-    breakingTorque = 3000
-=======
 	breakingForce = 300000
-    breakingTorque = 300000
->>>>>>> origin/master
-	tags = 
->>>>>>> origin/master
+    	breakingTorque = 300000
 	NODE
 	{
 		name = EngineNodeB