remake output file after strange merge

output/aci/thymio2-main-RoundHoles.TXT

@@ -333,13 +333,13 @@ X970250Y736000
 X862750Y779500
 X858250Y786500
 X852743Y792240
-X802764Y777750
 X809087Y771427
+X802764Y777750
 X805000Y417000
 X844000Y431000
 X929000Y456000
-X1064480Y592500
 X1058503Y598477
+X1064480Y592500
 X1097005Y606731
 X1091255Y629229
 X1083088Y632813
@@ -522,22 +522,19 @@ X931250Y835500
 X935750Y827000
 X936000Y811000
 X937500Y802500
-X954498Y828992
 X972999Y810491
-X998500Y796490
-X1024703Y796635
-X1041000Y811000
-X1048000Y818000
-X1050253Y841742
-X1038252Y843992
-X1044002Y851243
-<<<<<<< HEAD
-X1056487Y861000
-=======
-X1051752Y865743
->>>>>>> dfd80bb445a3c6774fdee837221b8278cd4eea97
-X1071504Y882744
+X954498Y828992
+X987000Y843000
+X979999Y859493
+X1000740Y857490
+X1002479Y875500
+X988750
+X1017251Y876744
+X1023251Y882994
+X1011738Y884012
+X1019738Y892012
 X1064753Y889495
+X1071504Y882744
 X1090660Y882839
 X1105255Y866743
 X1117006Y860743
@@ -578,7 +575,6 @@ X1116000Y1089500
 X1103500Y1101936
 X1108000Y1127000
 X1075750Y1131750
-<<<<<<< HEAD
 X1050000Y1106000
 X1049000Y1081000
 X1065000Y1085500
@@ -615,42 +611,21 @@ X809256Y874706
 X803740Y867494
 X810241Y822491
 X794240Y794237
-=======
-X1147500Y1135000
-X1141285Y1149000
-X1151101Y1165899
-X1164000Y1164000
-X1166000Y1095000
-X1175250Y985000
-X1171008Y975999
-X1190509Y970995
-X1188259Y930247
-X1166008Y928247
-X1151507Y925309
-X1145757Y943997
-X1147507Y967498
-X1132000Y962250
-X1072754Y945997
-X1019738Y892012
-X1023251Y882994
-X1017251Y876744
-X1011738Y884012
-X1002479Y875500
-X988750
-X979999Y859493
-X1000740Y857490
-X987000Y843000
-X1009250Y826992
+X998500Y796490
+X1024703Y796635
+X1041000Y811000
+X1048000Y818000
+X1050253Y841742
+X1038252Y843992
+X1044002Y851243
+X1056487Y861000
 X1073254Y827992
 X1080004Y833992
 X1101250Y823250
 X1109505Y811491
 X1088504Y799240
 X1073004Y802240
-X1166758Y797240
-X1188000Y835000
-X1189750Y844500
->>>>>>> dfd80bb445a3c6774fdee837221b8278cd4eea97
+X1009250Y826992
 X931250Y866250
 X949250Y890500
 X908500Y889250
@@ -663,66 +638,26 @@ X890000Y947500
 X926000Y993000
 X942985Y1007043
 X909996Y1029572
-<<<<<<< HEAD
 X977249Y916496
-X988750Y875500
-X1002479
-X1017251Y876744
-X1023251Y882994
-X1019738Y892012
-X1011738Y884012
-X1000740Y857490
-X979999Y859493
-X987000Y843000
-X1009250Y826992
-X1073254Y827992
-X1080004Y833992
-X1101250Y823250
-X1109505Y811491
-X1088504Y799240
-X1073004Y802240
-X1166758Y797240
-X1188000Y835000
 X1189750Y844500
+X1188000Y835000
+X1166758Y797240
 X1147500Y1135000
 X1141285Y1149000
 X1151101Y1165899
 X1164000Y1164000
-=======
-X817000Y973000
-X807241Y981996
-X796000Y930000
-X816241Y892745
-X831242Y886495
-X809256Y874706
-X803740Y867494
-X810241Y822491
-X794240Y794237
-X977249Y916496
-X992250Y1190250
-X1049348Y1186348
-X847493Y1182506
-X872500Y1154750
-X797000Y1152000
-X804250Y1172500
-X794945Y1185924
-X1205291Y1185838
->>>>>>> dfd80bb445a3c6774fdee837221b8278cd4eea97
 X1213646Y1164175
 X1216011Y1149004
 X1241262Y1142004
 X1259999Y1137000
 X1263999Y1183000
 X1278000Y1183000
 X1243583Y1171901
-<<<<<<< HEAD
 X1205291Y1185838
-=======
->>>>>>> dfd80bb445a3c6774fdee837221b8278cd4eea97
 X1228000Y1108000
 X1233500Y1074500
-X1190759Y1067753
 X1196513Y1062000
+X1190759Y1067753
 X1210760Y1044749
 X1216999Y1038000
 X1218011Y1028498

output/aci/thymio2-main.DRR

@@ -1,9 +1,5 @@
 ----------------------------------------------------------------------------------------------------------------------------------
-<<<<<<< HEAD
-NCDrill File Report For: thymio2-main.PcbDoc   04.07.2018  16:11:48
-=======
-NCDrill File Report For: thymio2-main.PcbDoc   01.06.2018  13:45:51
->>>>>>> dfd80bb445a3c6774fdee837221b8278cd4eea97
+NCDrill File Report For: thymio2-main.PcbDoc   06.07.2018  15:48:39
 ----------------------------------------------------------------------------------------------------------------------------------
 
 Layer Pair : Top Layer to Bottom Layer
@@ -12,11 +8,7 @@ ASCII SlotHoles File : thymio2-main-SlotHoles.TXT
 
 Tool       Hole Size               Hole Tolerance               Hole Type       Hole Count   Plated         Tool Travel
 ----------------------------------------------------------------------------------------------------------------------------------
-<<<<<<< HEAD
-T1      0.3mm (12mil)                                             Round             759       PTH        2500.23mm (98.43inch)
-=======
-T1      0.3mm (12mil)                                             Round             759       PTH        2564.52mm (100.97inch)
->>>>>>> dfd80bb445a3c6774fdee837221b8278cd4eea97
+T1      0.3mm (12mil)                                             Round             759       PTH        2531.59mm (99.67inch)
 T2      0.33mm (13mil)                                            Round             4         PTH        3.60mm (0.14inch)
 T3      0.55mm (22mil)                                            Slot              2         PTH        16.83mm (0.66inch)
 T4      0.6mm (24mil)                                             Round             2         PTH        1.25mm (0.05inch)
@@ -34,4 +26,4 @@ T15     1.5mm (59mil)                                             Round
 ----------------------------------------------------------------------------------------------------------------------------------
 Totals                                                                              822
 
-Total Processing Time (hh:mm:ss) : 00:00:01
+Total Processing Time (hh:mm:ss) : 00:00:00