From d107e8b29edae837791400c0df511c5d0f474189 Mon Sep 17 00:00:00 2001
From: NetKAN inflator Robot <netkan-bot@ksp-ckan.org>
Date: Sat, 30 Apr 2016 20:37:26 +0000
Subject: [PATCH]  "NetKAN generated mods -
 CustomAsteroids-Pops-Stock-Inner-v1.3.0"

---
 ...stomAsteroids-Pops-Stock-Inner-v1.3.0.ckan | 69 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/CustomAsteroids-Pops-Stock-Inner/CustomAsteroids-Pops-Stock-Inner-v1.3.0.ckan b/CustomAsteroids-Pops-Stock-Inner/CustomAsteroids-Pops-Stock-Inner-v1.3.0.ckan
index 04c888b1b1..df4a1e82ab 100644
--- a/CustomAsteroids-Pops-Stock-Inner/CustomAsteroids-Pops-Stock-Inner-v1.3.0.ckan
+++ b/CustomAsteroids-Pops-Stock-Inner/CustomAsteroids-Pops-Stock-Inner-v1.3.0.ckan
@@ -28,11 +28,76 @@
     ],
     "conflicts": [
         {
-            "name": "AlternisKerbol"
+            "name": "AlienSpaceProgram",
+            "comment": "No Kerbin."
+        },
+        {
+            "name": "AlternisKerbolRekerjiggered",
+            "comment": "Completely different system."
+        },
+        {
+            "name": "AlternisRealSolarSystem",
+            "comment": "Completely different system."
+        },
+        {
+            "name": "BorisSystem",
+            "comment": "Terrestrial planet in asteroid belt."
+        },
+        {
+            "name": "ChaniPlanetPack",
+            "comment": "Giant planet in asteroid belt."
+        },
+        {
+            "name": "HarderSolarSystem",
+            "comment": "Stock orbits not inclined."
+        },
+        {
+            "name": "Kronkus",
+            "comment": "Giant planet in asteroid belt."
+        },
+        {
+            "name": "Ktolemy",
+            "comment": "Completely different system."
+        },
+        {
+            "name": "LittleGreenMenFromMars",
+            "comment": "Completely different system."
+        },
+        {
+            "name": "NewHorizons",
+            "comment": "Completely different system."
         },
         {
             "name": "RealSolarSystem",
-            "comment": "The 6.4× and 10× Kerbol packs are compatible; how to allow them?"
+            "comment": "Completely different system."
+        },
+        {
+            "name": "RhatssPlanetpack",
+            "comment": "Giant planet in asteroid belt."
+        },
+        {
+            "name": "sidosUraniaSystem",
+            "comment": "Giant planet in asteroid belt."
+        },
+        {
+            "name": "SigmaBinary-core",
+            "comment": "Can change any planet's orbit."
+        },
+        {
+            "name": "SmallSolarSystem",
+            "comment": "Completely different system."
+        },
+        {
+            "name": "StockAlikeSolarSystem",
+            "comment": "Completely different system."
+        },
+        {
+            "name": "TerrestrialPlanetPack",
+            "comment": "Giant planet in asteroid belt."
+        },
+        {
+            "name": "UnchartedLands",
+            "comment": "Completely different system."
         }
     ],
     "install": [