From b479d9cdc2a25018b8297848c6b3e1c3da212f83 Mon Sep 17 00:00:00 2001
From: Ralph Metzler <rjkm@metzlerbros.de>
Date: Tue, 22 Mar 2016 22:43:14 +0100
Subject: [PATCH] remove conflict

---
 apps/octonet/ddtest.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/apps/octonet/ddtest.c b/apps/octonet/ddtest.c
index e471886..a53a923 100644
--- a/apps/octonet/ddtest.c
+++ b/apps/octonet/ddtest.c
@@ -192,17 +192,10 @@ int FlashDetect(int dev)
 		printf("Flash: SPANSION S25FL116K 16 MBit\n"); 
 		break;
         case SPANSION_S25FL132K : 
-<<<<<<< 472e247726096a6d88583bfaac91ce1f10f91c82
 		printf("Flash: SPANSION S25FL132K 32 MBit\n"); 
 		break;
         case SPANSION_S25FL164K : 
 		printf("Flash: SPANSION S25FL164K 64 MBit\n"); 
-=======
-		printf("Flash: SPANSION S25FL116K 32 MBit\n"); 
-		break;
-        case SPANSION_S25FL164K : 
-		printf("Flash: SPANSION S25FL116K 64 MBit\n"); 
->>>>>>> add license support
 		break;
 	}
 	return r;