From f6709453dfb068c49716ad678db734232c131db6 Mon Sep 17 00:00:00 2001
From: Matthew Heguy <plague006@gmail.com>
Date: Thu, 16 Jul 2015 21:43:10 -0400
Subject: [PATCH] Resolve conflict between OPTSpacePlaneParts and
 Mk3MiniExpansionPack (both versions locked to KSP 1.0.2)

---
 Mk3MiniExpansionPack/Mk3MiniExpansionPack-V1.1.5.ckan | 3 +++
 OPTSpacePlaneParts/OPTSpacePlaneParts-V1.6.9.1.ckan   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Mk3MiniExpansionPack/Mk3MiniExpansionPack-V1.1.5.ckan b/Mk3MiniExpansionPack/Mk3MiniExpansionPack-V1.1.5.ckan
index dfa33b6803..1b340650e1 100644
--- a/Mk3MiniExpansionPack/Mk3MiniExpansionPack-V1.1.5.ckan
+++ b/Mk3MiniExpansionPack/Mk3MiniExpansionPack-V1.1.5.ckan
@@ -17,6 +17,9 @@
             "install_to": "Ships"
         }
     ],
+    "conflicts": [
+        { "name": "OPTSpacePlaneParts" }
+    ],
     "resources": {
         "homepage": "http://forum.kerbalspaceprogram.com/threads/105063-0-90-Mk3-Mini-Expansion-Pack?p=1632752#post1632752",
         "kerbalstuff": "https://kerbalstuff.com/mod/449/Mk3%20Mini%20Expansion%20Pack"
diff --git a/OPTSpacePlaneParts/OPTSpacePlaneParts-V1.6.9.1.ckan b/OPTSpacePlaneParts/OPTSpacePlaneParts-V1.6.9.1.ckan
index a17a8ff557..2920f71e5e 100644
--- a/OPTSpacePlaneParts/OPTSpacePlaneParts-V1.6.9.1.ckan
+++ b/OPTSpacePlaneParts/OPTSpacePlaneParts-V1.6.9.1.ckan
@@ -16,6 +16,9 @@
             "name": "ModuleManager"
         }
     ],
+    "conflicts": [
+        { "name": "Mk3MiniExpansionPack" }
+    ],
     "resources": {
         "homepage": "http://forum.kerbalspaceprogram.com/threads/97525-0-90-WIP-DEV-OPT-V1-5-Mk3-Space-Shuttle-Expansions?p=1490754#post1490754",
         "kerbalstuff": "https://kerbalstuff.com/mod/340/OPT%20Space%20Plane%20Parts"