summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorJakob Kaivo <jkk@ung.org>2020-08-12 13:02:56 -0400
committerJakob Kaivo <jkk@ung.org>2020-08-12 13:02:56 -0400
commit11d0cc5d2a1dbdd8eaf42e866503f31f90263c69 (patch)
tree3ec52a316b6b1333a16ebc8c553df520cffc1445 /.gitmodules
parent04c90245dcf4bda90530522d491d91f8ce1a2f74 (diff)
fix merge error
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 0 insertions, 1 deletions
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