diff options
Diffstat (limited to 'build/CMakeFiles/TargetDirectories.txt')
| -rw-r--r-- | build/CMakeFiles/TargetDirectories.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/CMakeFiles/TargetDirectories.txt b/build/CMakeFiles/TargetDirectories.txt index 224455f..959b443 100644 --- a/build/CMakeFiles/TargetDirectories.txt +++ b/build/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,10 @@ +<<<<<<< HEAD D:/code/minesweeper/build/CMakeFiles/minesweeper.dir D:/code/minesweeper/build/CMakeFiles/edit_cache.dir D:/code/minesweeper/build/CMakeFiles/rebuild_cache.dir +======= +/home/dawidg81/minesweeper/build/CMakeFiles/minesweeper.dir +/home/dawidg81/minesweeper/build/CMakeFiles/test.dir +/home/dawidg81/minesweeper/build/CMakeFiles/edit_cache.dir +/home/dawidg81/minesweeper/build/CMakeFiles/rebuild_cache.dir +>>>>>>> e6a7c80d3261e8b0c3e73294c0dace4d36158c5d |