# HG changeset patch
# User nickolay
# Date 1507270661 -10800
# Node ID 9718e8de0cb2b9ccce3e79a98d0a7805d639ddfb
# Parent  efefacae534f778c8bb5074c27a4122b510643b5# Parent  8332e287d552912e320576193d334e5763b3b861
Слияние

diff -r 8332e287d552 -r 9718e8de0cb2 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Oct 06 09:17:41 2017 +0300
@@ -0,0 +1,2 @@
+.git/
+.gitignore/