Fixing merge conflict 2

2024-11-23 10:42:21 +00:00 · 2015-03-23 11:18:04 +03:00 · 2015-03-23 11:18:04 +03:00 · 7a9b19553a
commit 7a9b19553a
parent 1ae4ebe94e
5 changed files with 5 additions and 10132 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,3 +32,8 @@ version
 lisca.cpp
 main - копия.cpp
 result_files-*
+*.BACKUP.*
+*.LOCAL.*
+*.REMOTE.*
+*.BASE.*
+
--- a/nesca_startModule.cpp.BACKUP.3450.cpp
+++ b/nesca_startModule.cpp.BACKUP.3450.cpp
--- a/nesca_startModule.cpp.BASE.3450.cpp
+++ b/nesca_startModule.cpp.BASE.3450.cpp
--- a/nesca_startModule.cpp.LOCAL.3450.cpp
+++ b/nesca_startModule.cpp.LOCAL.3450.cpp
--- a/nesca_startModule.cpp.REMOTE.3450.cpp
+++ b/nesca_startModule.cpp.REMOTE.3450.cpp