Resolved the merge conflict

I think Bob moved some fiducials (good) and I failed to bring in his changes before submitting resistor change. All fixed. Should not affect his panel because it's just a part_id change on the schematic.
ctzsnooze · Mar 21, 2016 · 01b66aa · 01b66aa
1 parent 306af32
commit 01b66aa
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/hardware/OpenLog.brd b/hardware/OpenLog.brd
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<<<<<<< HEAD
-<eagle version="7.3.0">
-=======
 <eagle version="7.5.0">
->>>>>>> origin/hardware-v15
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>