wip

AUTOM1/AUTOM1.kicad_pcb

@@ -1493,11 +1493,7 @@
 			)
 			(fill yes)
 			(layer "F.Paste")
-<<<<<<< HEAD
 			(uuid "295fd344-5f2e-4571-a19b-97c268a60e60")
-=======
-			(uuid "db835eb3-e606-45da-a3c3-c073d6b3760c")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_poly
 			(pts
@@ -1517,11 +1513,7 @@
 			)
 			(fill yes)
 			(layer "F.Paste")
-<<<<<<< HEAD
 			(uuid "0a08d8be-1ac8-4c5e-b347-cf9fcdfb5dbc")
-=======
-			(uuid "1ec7bad2-ac65-4bff-ba36-793eec1ea2f8")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.05 -1.549999)
@@ -1531,11 +1523,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "ea6c00e9-81dc-4e13-8aa4-4663fc10a70f")
-=======
-			(uuid "69a49bc5-83b6-4286-b0b0-dc641d1ab9fd")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.05 1.549999)
@@ -1545,11 +1533,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "b3cf16b8-4145-40a2-98f6-60d7e016646b")
-=======
-			(uuid "05b82b0a-ca3f-41bb-9515-f7d6d964faf6")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.05 1.549999)
@@ -1559,11 +1543,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "d15d3335-2b3e-40bc-9e84-03763ae95a97")
-=======
-			(uuid "c9fbd0e1-1008-4b9b-bbd3-afa209e9d664")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.05 1.549999)
@@ -1573,11 +1553,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "f89cbb30-b482-4900-91db-7a1d6820e848")
-=======
-			(uuid "feed671a-8644-4269-a970-3d84f772c1df")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_circle
 			(center -0.599999 -1.1)
@@ -1588,11 +1564,7 @@
 			)
 			(fill no)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "99da300c-7faa-4e3c-892e-45747c51bdfc")
-=======
-			(uuid "c74f2a96-aee9-4af9-b686-62556053edd6")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 0)
@@ -6429,11 +6401,7 @@
 	(footprint "Package_TO_SOT_SMD:TO-263-2"
 		(layer "F.Cu")
 		(uuid "32c23ce1-1e88-4172-915a-00a69dfe8bc1")
-<<<<<<< HEAD
 		(at 148.475 72.155)
-=======
-		(at 142.5 50)
->>>>>>> refs/remotes/origin/master
 		(descr "TO-263/D2PAK/DDPAK SMD package, http://www.infineon.com/cms/en/product/packages/PG-TO263/PG-TO263-3-1/")
 		(tags "D2PAK DDPAK TO-263 D2PAK-3 TO-263-3 SOT-404")
 		(property "Reference" "Q9"
@@ -8349,11 +8317,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "06366fad-0a32-4cd7-997f-155041e171b8")
-=======
-			(uuid "365c9523-b0c7-44e9-89a1-69926abeb5ef")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.2225 1.50135)
@@ -8363,11 +8327,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "8f3f62e0-e77f-4e83-8af8-3f98e2cd981d")
-=======
-			(uuid "00d3f068-4ae6-451d-86cf-8845b6a07225")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.2225 2.2225)
@@ -8377,11 +8337,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "91a5face-cf9e-4410-8842-ef5e10f7b1b3")
-=======
-			(uuid "2ae4c9ed-d6f4-4a02-b295-4dc5f300c964")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.2225 -2.2225)
@@ -8391,11 +8347,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "9bf7631d-fc4f-4dba-af62-2dab6cd6091c")
-=======
-			(uuid "0a20174a-50b7-459e-8570-0b36022e6cba")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.2225 -1.50135)
@@ -8405,11 +8357,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "46a6a41f-f15b-45d4-9959-77878a8f516f")
-=======
-			(uuid "c0686572-7b39-4868-acab-2c5b574312a7")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.2225 2.2225)
@@ -8419,11 +8367,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "a694ffce-29e2-4801-b285-f285751bf654")
-=======
-			(uuid "d4e68fac-aab9-46d3-931d-91af5abcf4ce")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_circle
 			(center -3.2512 0)
@@ -8434,11 +8378,7 @@
 			)
 			(fill no)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "365df7c7-fd95-49df-aa47-0b275e9fe372")
-=======
-			(uuid "cd2df390-a414-4d6a-930a-081674ccc487")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.3495 -2.3495)
@@ -8448,11 +8388,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "a38571f6-1f5c-4b4a-9b9f-25654844c71f")
-=======
-			(uuid "f6d81777-42b4-4c11-b2fe-e5a5cbd0b16a")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.3495 -1.4478)
@@ -8462,11 +8398,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "ad8327f2-646c-4a8e-9668-a02173092219")
-=======
-			(uuid "77b61708-585a-4141-85c0-96a9ba503a74")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.3495 -1.4478)
@@ -8476,11 +8408,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "4e816f78-12cd-48f5-8c43-23ea2f347f1b")
-=======
-			(uuid "bfd1d203-2ed3-47f6-9b18-06f5012c44bb")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.3495 1.4478)
@@ -8490,11 +8418,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "c6cee502-aac5-487d-8ea1-2d14ea41ac11")
-=======
-			(uuid "817dc173-3788-4adf-abbb-e189ade90690")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.3495 1.4478)
@@ -8504,11 +8428,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "eeae3f11-0e80-4438-af3a-852b1eef21a5")
-=======
-			(uuid "0e25e2ad-68e5-449d-b7b7-c2c026a01daf")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.3495 2.3495)
@@ -8518,11 +8438,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "2143fd26-06dd-47c3-adcf-ea00ba7e14de")
-=======
-			(uuid "1157f6cc-ce5a-4a0b-98e5-557d93a852c0")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.3495 -2.3495)
@@ -8532,11 +8448,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "9fd71513-2a5d-4d87-8879-4e01ffb3834a")
-=======
-			(uuid "a4feb625-3981-4fc4-8f98-c75e4bca5eb5")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.3495 -1.4478)
@@ -8546,11 +8458,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "515c73fa-e828-4b03-be5a-436c04e626e9")
-=======
-			(uuid "d47ef17b-32a3-4357-a852-28f662bacb33")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.3495 -1.4478)
@@ -8560,11 +8468,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "8f79cd6e-1018-4938-b8d9-55b390fd394a")
-=======
-			(uuid "b17abcfd-c06e-4c88-bd12-4e220daff2fe")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.3495 1.4478)
@@ -8574,11 +8478,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "0b54abee-d963-43f1-8e5c-e12c1507631a")
-=======
-			(uuid "1d1fa1fe-e2f8-47eb-9607-8c88bd8957fd")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.3495 1.4478)
@@ -8588,11 +8488,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "283becb3-2896-4aa1-9cb4-86ff44e024dd")
-=======
-			(uuid "023ebe90-2039-461d-85f6-6dbd1c417dc5")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.3495 2.3495)
@@ -8602,11 +8498,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "1955f165-129c-452e-ac0d-cf167da2798c")
-=======
-			(uuid "6ac3f42e-da7e-4b12-91cb-c52e8e0bf20a")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.0955 -2.0955)
@@ -8616,11 +8508,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "d42f752d-c30c-4ee8-a428-c50c9a42b906")
-=======
-			(uuid "6fb61ab3-a1da-4f2e-88a6-840bbb65e6f5")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -2.0955 2.0955)
@@ -8630,11 +8518,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "0b152971-fe87-46b1-be4c-29520f2532a3")
-=======
-			(uuid "540b1c3e-e8f3-4803-b294-70e216784615")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.0955 -2.0955)
@@ -8644,11 +8528,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "9d314530-4400-4933-a0c1-c87ca9db6649")
-=======
-			(uuid "43d0db60-f0ee-4d38-8827-bb4632106e82")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 2.0955 2.0955)
@@ -8658,11 +8538,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "70b5c937-ec7a-4c67-96b7-5d0e2de2db1d")
-=======
-			(uuid "1b1157c9-2518-43ea-bda1-ad209d675d5a")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_circle
 			(center 0 0)
@@ -8673,11 +8549,7 @@
 			)
 			(fill no)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "6511a13e-2e95-478e-80d9-9636b883ee2c")
-=======
-			(uuid "62bd52c5-f02c-40af-b2f1-98502d406da5")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 0)
@@ -13503,7 +13375,7 @@
 	(footprint "Library:SOT_12-E3-08_VIS"
 		(layer "F.Cu")
 		(uuid "708ab920-81f2-444d-891a-bb8ec0a2376c")
-		(at 153.000001 69.9586)
+		(at 303.291999 6.5786)
 		(tags "BZX84C10-E3-08 ")
 		(property "Reference" "CR1"
 			(at 0 0 0)
@@ -13566,11 +13438,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "e31a58aa-b7e6-4df3-aa13-fd8508f63e41")
-=======
-			(uuid "256c2175-2975-48ad-b0fe-4a498418721a")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.58674 -0.8382)
@@ -13580,11 +13448,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "02c0ffa0-beff-4b48-8957-7c9d5840770f")
-=======
-			(uuid "84bd5890-1a25-4b0c-ac7c-38d832014309")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.413261 0.8382)
@@ -13594,11 +13458,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "c240ee69-a651-417c-9cc5-ecfc31975b2f")
-=======
-			(uuid "1eab8caf-a1f3-4fc6-bcbc-5f75456a2e82")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.6764 -0.8382)
@@ -13608,11 +13468,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "9c11c3a4-ec78-4230-8ee5-39b0e9404345")
-=======
-			(uuid "962e1fef-22d7-4e5d-8f7b-c849f99e0bfb")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.6764 0.8382)
@@ -13622,11 +13478,7 @@
 				(type solid)
 			)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "f699e3ed-1b19-4f63-9d05-5915d8d2ec3a")
-=======
-			(uuid "95ca1d53-7500-4255-950d-91dfff746dad")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_circle
 			(center -1 2.413)
@@ -13637,11 +13489,7 @@
 			)
 			(fill no)
 			(layer "F.SilkS")
-<<<<<<< HEAD
 			(uuid "3294520c-50f9-440d-a664-83d0a1eb3ee6")
-=======
-			(uuid "e864f761-1cab-4d89-86be-11bb8dc73b83")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.8034 -0.9652)
@@ -13651,11 +13499,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "3b4e3803-ed12-4da1-8b1a-e81a76b5ebc3")
-=======
-			(uuid "e20fb1a4-318a-4d22-a0b2-9957e330b868")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.8034 0.9652)
@@ -13665,11 +13509,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "fd1b2bc7-f7bb-48aa-b281-6cc55f61b7a8")
-=======
-			(uuid "833672f5-036f-4e30-b244-f99020ef6676")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.8034 0.9652)
@@ -13679,11 +13519,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "4c19fefd-b2e9-4768-9978-f43a0d1ab016")
-=======
-			(uuid "76108230-ed4d-439a-b298-6db3848a4ff4")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.4826 0.9652)
@@ -13693,11 +13529,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "c1385c47-52fb-48ec-9bc8-e579601a3d09")
-=======
-			(uuid "92731f83-e833-4597-900c-d6a3d30a7fc1")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.4826 1.905)
@@ -13707,11 +13539,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "b4570cf2-5aaf-4d00-bf4c-65d305daba4f")
-=======
-			(uuid "9a04fbde-e583-40fb-98ed-6fbbf1c2cdd6")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.4826 -1.905)
@@ -13721,11 +13549,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "3c413f8e-08bf-4853-8f36-8a701c1ded19")
-=======
-			(uuid "82df2398-811b-424a-9e26-bb85736db6aa")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.4826 -0.9652)
@@ -13735,11 +13559,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "ec512f05-bdff-4676-a9f5-302c149820bb")
-=======
-			(uuid "0f550832-c9a2-4939-b2f3-98fbbc0c33e9")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 0.4826 -0.9652)
@@ -13749,11 +13569,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "24155ff1-76d2-4598-bcab-3f349fbfdd0b")
-=======
-			(uuid "2fa27b8b-88ea-43ff-a9ea-a4120a7f96bb")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.4826 0.9652)
@@ -13763,11 +13579,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "a1f5e9e2-6b5e-4992-9543-687252843b7a")
-=======
-			(uuid "77b7c948-1d4e-47e7-a8d2-4210a7dfaa20")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.8034 -0.9652)
@@ -13777,11 +13589,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "32becbfc-6186-46e3-8fbe-8f5d2a58dff8")
-=======
-			(uuid "61e7980d-797a-4ba5-ae16-2be6f1e170bb")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.8034 -0.9652)
@@ -13791,11 +13599,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "268e45f4-1f40-49a9-879e-82ffe1cf7516")
-=======
-			(uuid "261f1f8c-50f2-4e4e-b7f6-cf06c351a31e")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.8034 0.9652)
@@ -13805,11 +13609,7 @@
 				(type solid)
 			)
 			(layer "F.CrtYd")
-<<<<<<< HEAD
 			(uuid "67ca2610-9497-48c1-bcf9-83264cf42d7b")
-=======
-			(uuid "33061982-fd27-4f7e-8bde-42582529a3c1")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.5494 -0.7112)
@@ -13819,11 +13619,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "1b6552a4-bc38-4047-be27-ab9f849b405f")
-=======
-			(uuid "7ae061b6-e6f4-4850-9134-35b4be03a9b9")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.5494 0.7112)
@@ -13833,11 +13629,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "b923d700-6923-410f-8920-27f2ad585147")
-=======
-			(uuid "9ab2565b-dd19-4272-9bce-aedec22cf981")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.2286 0.7112)
@@ -13847,11 +13639,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "a6f3e325-84f7-40e3-85b7-fd2ecc6a50c2")
-=======
-			(uuid "a06393db-b470-4790-b080-c650619ec6ad")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -1.2286 1.2954)
@@ -13861,11 +13649,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "7c29be33-2c52-4252-bee1-04cf8b97a893")
-=======
-			(uuid "e4abf3e1-2199-4e9e-9dfe-791aaad69645")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.7714 0.7112)
@@ -13875,11 +13659,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "35aa02c2-b29b-42a4-927b-8c44d0376db4")
-=======
-			(uuid "5aee6b20-b99a-491b-bcde-d5a17b50f2bc")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.7714 1.2954)
@@ -13889,11 +13669,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "ae353823-2605-45c3-822a-390ddbe0fd3a")
-=======
-			(uuid "bff8d7c6-d6b5-4caf-a504-ebc6bd5d09dd")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.2286 -1.2954)
@@ -13903,11 +13679,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "65eede37-7713-402d-9486-de12fa51d5b0")
-=======
-			(uuid "f4c0b4ee-5ae1-4b65-9c7b-48ad4a27f8be")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start -0.2286 -0.7112)
@@ -13917,11 +13689,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "4e6e3b99-65e7-4a27-9c4d-018c5335ed85")
-=======
-			(uuid "e8591e06-eb1a-4b87-8570-499d7b7df37d")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 0.2286 -1.2954)
@@ -13931,11 +13699,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "7d0723fe-4c3e-4654-9170-98941b92d3d9")
-=======
-			(uuid "d7dcb96f-0c6b-4296-9492-7a2e6124d4c5")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 0.2286 -0.7112)
@@ -13945,11 +13709,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "f521372f-ece0-4fb6-bbf0-89f1dfe63e18")
-=======
-			(uuid "efbb6fd3-fb31-4d99-8386-903ed65fe983")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 0.7714 0.7112)
@@ -13959,11 +13719,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "51e2770a-ee91-4707-aacb-55c457770794")
-=======
-			(uuid "f1a8625e-5cd0-4325-b9c5-b431a01fb25f")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 0.7714 1.2954)
@@ -13973,11 +13729,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "d407727c-741e-4c72-9fbb-c301867ec271")
-=======
-			(uuid "de6c571a-57b6-4ff4-b56e-67aa09443dd1")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.2286 0.7112)
@@ -13987,11 +13739,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "0a61f71e-9975-427d-8d04-695fbdd44c3e")
-=======
-			(uuid "e24d4157-e429-4804-9eeb-33728874d359")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.2286 1.2954)
@@ -14001,11 +13749,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "6ca06edb-b0d5-419c-a09a-77394b70d5a5")
-=======
-			(uuid "3ee3adbc-3489-4c53-81c5-369d512ecd34")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.5494 -0.7112)
@@ -14015,11 +13759,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "a393ee58-3fac-4f59-93eb-316e1314150f")
-=======
-			(uuid "49450a89-2d2b-49e5-b28d-70b5a072ce6b")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_line
 			(start 1.5494 0.7112)
@@ -14029,11 +13769,7 @@
 				(type solid)
 			)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "93ace241-cc40-46be-b7ba-b53719fc548f")
-=======
-			(uuid "0003e7fb-8b60-4679-8368-888d6f5b431c")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_circle
 			(center -1 0.4572)
@@ -14044,11 +13780,7 @@
 			)
 			(fill no)
 			(layer "F.Fab")
-<<<<<<< HEAD
 			(uuid "3c98e291-9d5c-4cd9-8140-5de5510a367f")
-=======
-			(uuid "38f060fa-65c0-4247-9cfc-a6d00c9bca88")
->>>>>>> refs/remotes/origin/master
 		)
 		(fp_text user "${REFERENCE}"
 			(at 0 0 0)
@@ -21054,11 +20786,7 @@
 	(footprint "Resistor_SMD:R_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "a3a8e2f0-aa69-494c-8c59-2de7e7163eb8")
-<<<<<<< HEAD
 		(at 85.507 68.326)
-=======
-		(at 153.655 91)
->>>>>>> refs/remotes/origin/master
 		(descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "resistor")
 		(property "Reference" "R39"
@@ -29165,11 +28893,7 @@
 	(footprint "TestPoint:TestPoint_THTPad_D4.0mm_Drill2.0mm"
 		(layer "F.Cu")
 		(uuid "f9756f97-61d8-4fa8-87a0-5f198dc4497a")
-<<<<<<< HEAD
 		(at 155.448 90.678)
-=======
-		(at 159 120)
->>>>>>> refs/remotes/origin/master
 		(descr "THT pad as test Point, diameter 4.0mm, hole diameter 2.0mm")
 		(tags "test point THT pad")
 		(property "Reference" "J9"

AUTOM1/~AUTOM1.kicad_pcb.lck

@@ -0,0 +1 @@
+{"hostname":"LAPTOP-KPU53QSC","username":"user"}