[linux-yocto] [PATCH 1/2] ip_nf.cfg: clean up bad merge lines

[Saul Wold]

These lines don't belong in the .cfg and cause warnings during
the configme process

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 cfg/net/ip_nf.cfg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cfg/net/ip_nf.cfg b/cfg/net/ip_nf.cfg
index 3b3eed0..f43e7b2 100644
--- a/cfg/net/ip_nf.cfg
+++ b/cfg/net/ip_nf.cfg
@@ -1,8 +1,3 @@
-diff --git a/ktypes/standard/standard.cfg b/ktypes/standard/standard.cfg
-index a6a3d92..a392c7d 100644
--- a/ktypes/standard/standard.cfg
-+++ b/ktypes/standard/standard.cfg
-@@ -136,50 +136,6 @@ CONFIG_BRIDGE_NETFILTER=y
 #
 # IP: Netfilter Configuration
 #
-- 
2.7.4