Merge with c2c1a3b30a1745cbc2d38d12d59827585f2e702c
authorymh <ymh.work@gmail.com>
Thu, 30 Aug 2012 18:36:02 +0200
changeset 12 142528c37705
parent 11 1f90796f6106 (current diff)
parent 10 c2c1a3b30a17 (diff)
child 13 cd3db02046b1
Merge with c2c1a3b30a1745cbc2d38d12d59827585f2e702c
.hgignore
README.markdown
--- a/.hgignore	Thu Aug 30 18:33:50 2012 +0200
+++ b/.hgignore	Thu Aug 30 18:36:02 2012 +0200
@@ -1,5 +1,6 @@
 
 syntax: regexp
+^\.git
 ^\.project$
 ^web/index$
 ^web/log$
@@ -21,5 +22,4 @@
 ^sbin/sync/config\.py$
 syntax: regexp
 ^virtualenv/sync/project-boot\.py$
-syntax: regexp
 ^\.gitignore$
\ No newline at end of file