From 0da9336ed90429a5ba6004600f2f88ae7d22a40d Mon Sep 17 00:00:00 2001
From: Derek Molloy <Derek.Molloy@dcu.ie>
Date: Thu, 4 Jul 2013 16:27:48 +0100
Subject: [PATCH] Update DM-GPIO-Test.dts

removed git notation
---
 overlay/DM-GPIO-Test.dts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/overlay/DM-GPIO-Test.dts b/overlay/DM-GPIO-Test.dts
index ce8a4d4..73d88f3 100644
--- a/overlay/DM-GPIO-Test.dts
+++ b/overlay/DM-GPIO-Test.dts
@@ -32,13 +32,8 @@
 				0x030 0x27  /* P8_12 44 INPUT  MODE7 pulldown - Green Wire */
 				0x024 0x2f  /* P8_13 23 INPUT  MODE7 none     - White Wire */
                        
-<<<<<<< HEAD
-                               /* OUTPUT GPIO(mode7) 0x07 pullup, 0x17 pulldown, 0x0f no pullup/down */
-			       /* INPUT GPIO(mode7) 0x27 pullup, 0x37 pulldown, 0x2f no pullup/down */
-=======
                                /* INPUT  GPIO(mode7) 0x07 pulldown, 0x17 pullup, 0x?f no pullup/down */
 			       /* OUTPUT GPIO(mode7) 0x27 pulldown, 0x37 pullup, 0x?f no pullup/down */
->>>>>>> f83cf685371044f2fbc8e8da09759bed24038367
 			>;
 		  };
              };