Page Menu
Home
Phabricator (Chris)
Search
Configure Global Search
Log In
Files
F117923
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
648 B
Referenced Files
None
Subscribers
None
View Options
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
Details
Attached
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)
Attached To
Mode
R72 DarthInvaders
Attached
Detach File
Event Timeline