From 97189a34f486bb9057a679574e9720ec0c0a5932 Mon Sep 17 00:00:00 2001
From: Steve Lascos <steve@blackaddr.com>
Date: Thu, 13 Sep 2018 20:38:47 -0400
Subject: [PATCH] .

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

diff --git a/README.md b/README.md
index fedb292..d4a41ac 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-## BALibrary Library
-=======
 ## BALibrary
->>>>>>> 1babb0786fb0954d86b8c7ab05485a09d2b401d3
 This library is under active development as of 2018.
 
 Last tested with: