fix some stupid merging conflicts that I don't understand ;-)

gui.js

@@ -3210,11 +3210,7 @@ IDE_Morph.prototype.aboutSnap = function () {
         module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn,
         world = this.world();
 
-<<<<<<< HEAD
     aboutTxt = 'Snap! 4.1 - dev -\nBuild Your Own Blocks\n\n'
-=======
-    aboutTxt = 'Snap! 4.0.10.2\nBuild Your Own Blocks\n\n'
->>>>>>> master
         + 'Copyright \u24B8 2017 Jens M\u00F6nig and '
         + 'Brian Harvey\n'
         + 'jens@moenig.org, bh@cs.berkeley.edu\n\n'