fixing merge conflicts

This commit is contained in:
Michael Townsend
2014-12-07 17:12:46 -05:00
7 changed files with 3302 additions and 63 deletions
+9 -14
View File
@@ -5,19 +5,14 @@ A Minimalist Text Adventure Game
[Click to play](http://adarkroom.doublespeakgames.com/)
[
[Chinese](http://adarkroom.doublespeakgames.com/?lang=zh_cn) |
[French](http://adarkroom.doublespeakgames.com/?lang=fr) |
[German](http://adarkroom.doublespeakgames.com/?lang=de) |
[Italian](http://adarkroom.doublespeakgames.com/?lang=it) |
[Korean](http://adarkroom.doublespeakgames.com/?lang=ko) |
[Polish](http://adarkroom.doublespeakgames.com/?lang=pl) |
[Russian](http://adarkroom.doublespeakgames.com/?lang=ru) |
[Spanish](http://adarkroom.doublespeakgames.com/?lang=es) |
[Swedish](http://adarkroom.doublespeakgames.com/?lang=sv) |
[Turkish](http://adarkroom.doublespeakgames.com/?lang=tr) |
[Ukrainian](http://adarkroom.doublespeakgames.com/?lang=uk)
]
Language | Options
-------- | --------
[Chinese](http://adarkroom.doublespeakgames.com/?lang=cn) | [French](http://adarkroom.doublespeakgames.com/?lang=fr)
[German](http://adarkroom.doublespeakgames.com/?lang=de) | [Italian](http://adarkroom.doublespeakgames.com/?lang=it)
[Japanese](http://adarkroom.doublespeakgames.com/?lang=jp) | [Korean](http://adarkroom.doublespeakgames.com/?lang=kr)
[Polish](http://adarkroom.doublespeakgames.com/?lang=pl) | [Portuguese](http://adarkroom.doublespeakgames.com/?lang=pg)
[Russian](http://adarkroom.doublespeakgames.com/?lang=ru) | [Spanish](http://adarkroom.doublespeakgames.com/?lang=es)
[Swedish](http://adarkroom.doublespeakgames.com/?lang=sv) | [Turkish](http://adarkroom.doublespeakgames.com/?lang=tr)
[Ukrainian](http://adarkroom.doublespeakgames.com/?lang=uk)
[Play on GitHub](http://continuities.github.io/adarkroom)