Page MenuHomePhabricator (Chris)

No OneTemporary

Authored By
Unknown
Size
648 B
Referenced Files
None
Subscribers
None
diff --git a/Pictures/EARTH.jpg b/Pictures/EARTH.jpg
new file mode 100644
index 0000000..3e60da3
Binary files /dev/null and b/Pictures/EARTH.jpg differ
diff --git a/Pictures/SpaceShips.jpg b/Pictures/SpaceShips.jpg
new file mode 100644
index 0000000..9dd0a29
Binary files /dev/null and b/Pictures/SpaceShips.jpg differ
diff --git a/scores.txt b/scores.txt
index f36b25c..1897e0c 100644
--- a/scores.txt
+++ b/scores.txt
@@ -1,10 +1,14 @@
+<<<<<<< HEAD
1030 qwerty
720 ENTER NAME
0 name
0 NAME
0 NAME
0 NAME
0 NAME
0 NAME
0 NAME
-0 NAME
\ No newline at end of file
+0 NAME
+=======
+0 name
+>>>>>>> 57cab303b66f250bb68b2d5566fdf713aac546e7

File Metadata

Mime Type
text/x-diff
Expires
Thu, May 14, 11:47 PM (1 d, 6 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
63742
Default Alt Text
(648 B)

Event Timeline