From: Arjen Baart <arjen@andromeda.nl>
Date: Sun, 2 Feb 2020 13:40:33 +0000 (+0100)
Subject: Merge conflict in .gitignore
X-Git-Url: http://www.andromeda.nl/gitweb/?a=commitdiff_plain;h=4c3e2ac2996eb6f353b7a05944263a8ffae1e9f6;p=wakeup.git

Merge conflict in .gitignore
---

4c3e2ac2996eb6f353b7a05944263a8ffae1e9f6
diff --cc .gitignore
index fccb39b,5f70486..445006e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,2 +1,11 @@@
  Makefile.in
 +aclocal.m4
 +autom4te.cache
 +compile
 +config.h.in
 +configure
 +depcomp
 +install-sh
 +missing
 +test-driver
+ .*.swp