Fixed merge conflict .gitignore

.gitignore

indexer/IndexStreamReader.cpp

indexer/IndexStreamReader.h

indexer/Indexer.cpp

indexer/Indexer.h

indexer/IndexerTests.cpp

indexer/index0.txt

indexer/index1.txt

indexer/index2.txt

indexer/index3.txt

indexer/tests/s-test1.txt

indexer/tests/s-test2.txt

indexer/tests/s-test3.txt

indexer/tests/s-test4.txt

indexer/tests/source/test1.out.correct.txt

indexer/tests/source/test1.txt

indexer/tests/source/test1out.txt

indexer/tests/test

indexer/tests/test.cpp

indexer/tests/test1.txt