Clean up merge conflict.

Author: zfi

src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties

@@ -26,15 +26,9 @@ footer.librarieslink = External libraries
 footer.clientdownloadlink = BlocklyProp-client
 
 # Application version numbers.
-<<<<<<< HEAD
 application.major = 1
 application.minor = 0
 application.build = 442
-=======
-application.major = 0
-application.minor = 101
-application.build = 439
->>>>>>> 0.101
 
 html.content_missing = Content missing