From a9ee1bd3f4f97d38f9d2ba92dc2cec2032b90f4a Mon Sep 17 00:00:00 2001
From: ABZB <abzb13@gmail.com>
Date: Sun, 6 Sep 2015 20:55:50 -0400
Subject: [PATCH] Fixes conflicts

Fixes conflicts with the realfuels patch & the KSPI patch. I am unsure what mod this is for, it should get a NEEDS for that specifically, as well.
---
 .../GameData/Mk2Expansion/Patches/Mk2X_NTJ_decay.cfg          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mk2Expansion-1.5.1/GameData/Mk2Expansion/Patches/Mk2X_NTJ_decay.cfg b/Mk2Expansion-1.5.1/GameData/Mk2Expansion/Patches/Mk2X_NTJ_decay.cfg
index 043525c..b06ad36 100644
--- a/Mk2Expansion-1.5.1/GameData/Mk2Expansion/Patches/Mk2X_NTJ_decay.cfg
+++ b/Mk2Expansion-1.5.1/GameData/Mk2Expansion/Patches/Mk2X_NTJ_decay.cfg
@@ -1,4 +1,4 @@
-@PART[M2X_AtomicJet]
+@PART[M2X_AtomicJet]:NEEDS[!KSPIntegration,!RealFuelsMK2]
 {
 
 @mass = 3.45
@@ -34,4 +34,4 @@ maxAmount = 20
 isTweakable = false
 hideFlow = true
 }
-}
\ No newline at end of file
+}