X-Git-Url: http://git.smho.de/gw/?p=owTools.git;a=blobdiff_plain;f=src%2FowInterface.cpp;h=b4d5d93bba0d0fd8fdd62531c0d801ff34d92dad;hp=0b189fab1940aef9397f7eac52e88fa191e2d619;hb=8b3ce8126a8bbc16822e939bc46f513e1c52b3d3;hpb=2d637281cefcc16f27911887827217744880e74c

diff --git a/src/owInterface.cpp b/src/owInterface.cpp
old mode 100755
new mode 100644
index 0b189fa..b4d5d93
--- a/src/owInterface.cpp
+++ b/src/owInterface.cpp
@@ -476,11 +476,7 @@ int owInterface::owSearch() {
 		}
 		while(rom_byte_number < 8);  // loop until through all ROM bytes 0-7
 		// if the search was successful then
-<<<<<<< HEAD
 		if (!((id_bit_number < 65) || (crc8 != 0)))		 {
-=======
-		if (!((id_bit_number < 65) || (crc8 != 0))) {
->>>>>>> origin/master
 			// search successful so set LastDiscrepancy,LastDeviceFlag,search_result
 			LastDiscrepancy = last_zero;
 			// check for last device