v0.3.1 with a small fix

TheNewNormal · Apr 28, 2014 · 0609e6c · 0609e6c
1 parent 25424f2
commit 0609e6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/CoreOS GUI/CoreOS GUI-Info.plist b/src/CoreOS GUI/CoreOS GUI-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.0</string>
+	<string>0.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>150</string>
+	<string>159</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/first-init.command b/src/first-init.command
@@ -16,10 +16,8 @@ ssh-add ~/.vagrant.d/insecure_private_key
 # Add current user to sudoers
 echo "Add current user to sudoers for the shared folder access from the VM"
 sudo ~/coreos-osx/bin/install_vagrant_sudoers.command
-<<<<<<< HEAD
-=======
-sudo chmod +w /etc/exports
->>>>>>> dev
+
+sudo chmod 664 /etc/exports
 
 # donwload etcdctl and fleetctl
 cd ~/coreos-osx/bin