fix merge conflicts

.travis.yml

@@ -13,7 +13,7 @@ matrix:
     - os: osx
 
 language: node_js
-node_js: "8"
+node_js: "10"
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

README.md

@@ -40,7 +40,7 @@ If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 brew cask install vscodium
 ```
 
-_Note: if you see "App can’t be opened because it is from an unidentified developer" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on a Mac._
+_Note for Mac OS X Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
 
 #### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
 If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)):

VSCodium-AppImage-Recipe.yml

@@ -32,4 +32,4 @@ script:
   - convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
   - convert vscodium.png -resize 24x24 usr/share/icons/hicolor/24x24/apps/vscodium.png
   - convert vscodium.png -resize 22x22 usr/share/icons/hicolor/22x22/apps/vscodium.png
-  - ( cd usr/bin/ ; ln -s ../share/vscodium/vscodium  . )
+  - ( cd usr/bin/ ; ln -s ../share/vscodium/codium  . )

build.sh

@@ -22,7 +22,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   nameShort='setpath(["nameShort"]; "VSCodium")'
   nameLong='setpath(["nameLong"]; "VSCodium")'
   linuxIconName='setpath(["linuxIconName"]; "vscodium")'
-  applicationName='setpath(["applicationName"]; "vscodium")'
+  applicationName='setpath(["applicationName"]; "codium")'
   win32MutexName='setpath(["win32MutexName"]; "vscodium")'
   win32DirName='setpath(["win32DirName"]; "VSCodium")'
   win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
@@ -45,7 +45,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     # unless the app name is code-oss
     # as we are renaming the application to vscodium
     # we need to edit a line in the post install template
-    sed -i "s/code-oss/vscodium/" resources/linux/debian/postinst.template
+    sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
   fi
 
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

update_version.sh

@@ -136,6 +136,9 @@ git pull origin master # in case another build just pushed
 git add .
 dateAndMonth=`date "+%D %T"`
 git commit -m "Travis update: $dateAndMonth (Build $TRAVIS_BUILD_NUMBER)"
-git push origin master --quiet
+if ! git push origin master --quiet; then
+  git pull origin master
+  git push origin master --quiet
+fi
 
 cd ..

win32-build.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0 
   inputs:
-    versionSpec: '8.x'
+    versionSpec: '10.x'
 - script: |
     choco install jq 
   displayName: 'install jq from choco'