Source

wsgilog / .hgignore

Diff from to

File .hgignore

 *.pyc
 *.egg-info
 *~
+<<<<<<< local
 .DS_Store
+=======
+>>>>>>> other
 .figleaf
 .coverage
 build/
 dist/
+<<<<<<< local
+=======
+
+syntax: glob
+>>>>>>> other
 .project
+<<<<<<< local
 .pydevproject
 .git/
 .settings/
 ^graphalchemy/tests/foo3$
 syntax: regexp
 ^profile$
+=======
+>>>>>>> other
 syntax: glob
+<<<<<<< local
 tox/*
 syntax: glob
-.tox/*
+.tox/*=======
+.pydevproject>>>>>>> other