diff options
Diffstat (limited to '2048 Game/configFile.txt')
| -rw-r--r-- | 2048 Game/configFile.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/2048 Game/configFile.txt b/2048 Game/configFile.txt index 0a28df6..daa81a6 100644 --- a/2048 Game/configFile.txt +++ b/2048 Game/configFile.txt @@ -1,4 +1,11 @@ +<<<<<<< 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
\ No newline at end of file +0 0 0 0 +>>>>>>> 0a5ef9619d59eeb0769e1195298ba2f5a37fc6b5 |