diff options
Diffstat (limited to '2048 Game/configFile.txt')
| -rw-r--r-- | 2048 Game/configFile.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/2048 Game/configFile.txt b/2048 Game/configFile.txt index daa81a6..485ce3e 100644 --- a/2048 Game/configFile.txt +++ b/2048 Game/configFile.txt @@ -1,11 +1,4 @@ -<<<<<<< HEAD 2 4 8 16 4 2 16 8 2 4 8 16 4 2 128 128 -======= -4 2 2 0 -0 0 0 0 -0 0 0 0 -0 0 0 0 ->>>>>>> 0a5ef9619d59eeb0769e1195298ba2f5a37fc6b5 |