remove merging flag

Tinkerforge · Jul 17, 2017 · 1ec2fc5 · 1ec2fc5
1 parent a3c5179
commit 1ec2fc5
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/SOT363.kicad_mod b/SOT363.kicad_mod
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 (module SOT363 (layer F.Cu) (tedit 5964A09E)
   (attr smd)
   (fp_text reference D2 (at 0.35 0 90) (layer F.Fab)