Mercurial > lada > lada-server

diff .hgignore @ 840:2fe625c91ab3
Merged branches.
author: Raimund Renkert <raimund.renkert@intevation.de>
date: Thu, 21 Jan 2016 09:01:57 +0100
parents: db7866a95cd2
children: 565c8a67034d
--- a/.hgignore	Fri Jan 08 12:20:31 2016 +0100
+++ b/.hgignore	Thu Jan 21 09:01:57 2016 +0100
@@ -8,6 +8,8 @@
 .factorypath
 .gitignore
 .project
+*.swp
+*.swo
 *~
 
 # intellij support - ignore *.iml, .idea
@@ -18,4 +20,3 @@
 syntax: regexp
 ^target/
 ^.settings
-
author	Raimund Renkert <raimund.renkert@intevation.de>
date	Thu, 21 Jan 2016 09:01:57 +0100
parents	db7866a95cd2
children	565c8a67034d