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

diff --git a/src/owInterface.cpp b/src/owInterface.cpp
index b02c047..0b189fa 100755
--- a/src/owInterface.cpp
+++ b/src/owInterface.cpp
@@ -476,7 +476,11 @@ 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