From 8a1708985159411a0ec4f793597df07e34e4f61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TED=C3=BC?= <t.duentzsch@fasttube.de>
Date: Mon, 7 Feb 2022 16:06:44 +0100
Subject: [PATCH] updated README.md

---
 README.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/README.md b/README.md
index 5c28fc9..2231954 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # FaSTTUBe Logos library for KiCAD 6.0
 ## Contents:
 FaSTTUBe_connectors
@@ -10,14 +9,3 @@ Download the files and extract them to a "libraries" folder inside your KiCAD pr
 Afterwords select "Preferences" and "manage symbol libraries".
 In the new window select the tab "project libraries" and add all libraries (.kicad_sym) using the folder icon.
 Repeat the same for "manage footprint libraries" with all .pretty folders
-=======
-# FaSTTUBe KiCAD libraries
-Created for KiCAD 6.0
-## How to install
-Tutorial coming soon...
-## ToDo:
-Add Connector library with:
-- M8 / M12 Connectors
-- Micro-Mate-N-Lok
-- iGrid
->>>>>>> 4650dbcfa29d7a954888b18f01df236a9f87d722