Update 2021-09-14.md

22e606e4 · Betz · 6a046a79 · 22e606e4
Commit 22e606e4 authored Aug 11, 2021 by Betz
--- a/content/events/electronics-things/2021-09-14.md
+++ b/content/events/electronics-things/2021-09-14.md
@@ -5,7 +5,6 @@ endtime: "20:30"
 linktitle: "How I made my first PCB in KiCAD"
 title: "How I made my first PCB in KiCAD"
 price: "Free"
-<<<<<<< HEAD
 series: "electronics"
 eventtype: "members"
 location: "HSBXL"