From 11d0cc5d2a1dbdd8eaf42e866503f31f90263c69 Mon Sep 17 00:00:00 2001
From: Jakob Kaivo <jkk@ung.org>
Date: Wed, 12 Aug 2020 13:02:56 -0400
Subject: fix merge error

---
 .gitmodules | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index ef83fe40..eeeb9819 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
-=======
 [submodule "test"]
 	path = tests
 	url = git@github.com:jkaivo/libc-tests.git
-- 
cgit v1.2.1