Конфликт решен

ZothOmmog · Jul 12, 2018 · 0b462b3 · 0b462b3
2 parents 5cc8da4 + b9a3057
commit 0b462b3
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 463 deletions.
diff --git a/.cproject b/.cproject
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 /.settings/*
 /Debug/*
 /Release/*
-*.ini
-
+*.ini