Merge remote-tracking branch 'origin/master'

Conflicts: messages.json
pafnuty · Aug 31, 2015 · 7b5a35f · 7b5a35f
2 parents 26b760a + 0f7d0d9
commit 7b5a35f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/messages.json b/messages.json
@@ -1,6 +1,10 @@
 {
     "install": "README.md",
     "2014.09.13.00.00.00": "messages/2014.09.13.md",
+<<<<<<< HEAD
     "2015.02.13.00.00.00": "messages/2015.02.13.md",
     "2015.08.31.00.00.00": "messages/2015.08.31.md"
+=======
+    "2015.02.13.00.00.00": "messages/2015.02.13.md"
+>>>>>>> origin/master
 }