Change git comments that make errors

[owTools.git] / src / owInterface.cpp

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