problems with spaces & reading solved
problems with spaces & reading solved
some intermediate changes
add some changes for changed interfaces
осознано,понято и доделано до состояния "шестая задача"
надеюсь
.
.
6task
7task
77&&&
а так?
Merge branch 'help' into 5+4

Conflicts:
	src/ru/fizteh/fivt/students/lukina/MultiFileMap/MultiFileMap.java
Merge branch '5+4'

Conflicts:
	src/ru/fizteh/fivt/students/lukina/DataBase/DBase.java
	src/ru/fizteh/fivt/students/lukina/DataBase/DBaseProvider.java
	src/ru/fizteh/fivt/students/lukina/DataBase/DataBase.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseProviderTest.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseTest.java
Merge branch '5+4' into master1

Conflicts:
	src/ru/fizteh/fivt/students/lukina/DataBase/DBase.java
	src/ru/fizteh/fivt/students/lukina/DataBase/DBaseProvider.java
	src/ru/fizteh/fivt/students/lukina/DataBase/DataBase.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseProviderTest.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseTest.java
Merge branch 'master2' into 5+4

Conflicts:
	src/ru/fizteh/fivt/students/lukina/DataBase/DBase.java
	src/ru/fizteh/fivt/students/lukina/DataBase/DBaseProvider.java
	src/ru/fizteh/fivt/students/lukina/DataBase/DataBase.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseProviderTest.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseTest.java
Merge branch 'master1' into master2
Merge branch '4+4'

Conflicts:
	src/ru/fizteh/fivt/students/lukina/Parallel/DBaseLoader.java
	src/ru/fizteh/fivt/students/lukina/Parallel/DBaseProviderFactory.java
	src/ru/fizteh/fivt/students/lukina/Parallel/DBaseRow.java
Merge branch 'master2'

Conflicts:
	src/ru/fizteh/fivt/students/lukina/Parallel/DBaseProvider.java
Merge branch 'FileMap'

Conflicts:
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseProviderFactoryTest.java
	src/ru/fizteh/fivt/students/lukina/Tests/DBaseRowTest.java