...

diff --cc .gitignore
index a0d9e2709b7265ab76d9f46152071f6ee064e962,9ecce3fdf3e0b038e194ae795df4f6a2a94fc374..059038079ecfc454364d1298d152c483abfa08d6
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -42,3 -43,4 +42,4 @@@ thttpd.con
  .Trashes
  *.db
  *.swp
 ->>>>>>> 2f96ef1981c27f555a577675e0f4196571432b53
++