merge conflicting files

mini-beieli PCB cubecell version
2024-07-13 19:50:10 +02:00 · 2024-07-13 19:50:10 +02:00 · 2020-10-13 19:40:06 +02:00 · 2020-12-26 12:24:37 +01:00 · 2020-12-26 17:17:34 +01:00
diff --git a/Joerg Lehmann b/Joerg Lehmann
Joerg Lehmann d0089ae3b9 merge conflicting files		2024-07-13 19:50:10 +02:00
kicad-files	merge conflicting files	2024-07-13 19:50:10 +02:00
pcbway-3.0	state before change to HTCC-AM01	2020-10-13 19:40:06 +02:00
pcbway-5.0	pcbway files	2020-12-26 12:24:37 +01:00
pcbway-5.1	version 5.1, pos file should not be in gerber zip	2020-12-26 17:17:34 +01:00