From 67af030df726d02c26de31b544815ae5ce5ee6ed Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 30 Nov 2018 14:33:27 -0800
Subject: [PATCH] Revert "Bump v3.1.0-beta.1"

This reverts commit f0b47b25411664e3323d21c4734d89a6ba0f75f1.
---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 6 +++---
 electron.gyp                          | 2 +-
 package-lock.json                     | 2 +-
 package.json                          | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 13ff991047a..b19ed55f4e8 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>3.1.0</string>
+  <string>3.0.10</string>
   <key>CFBundleShortVersionString</key>
-  <string>3.1.0</string>
+  <string>3.0.10</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index b59e38b5f76..f827649a2ff 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,0,1
- PRODUCTVERSION 3,1,0,1
+ FILEVERSION 3,0,10,0
+ PRODUCTVERSION 3,0,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "3.1.0"
+            VALUE "FileVersion", "3.0.10"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "3.1.0"
+            VALUE "ProductVersion", "3.0.10"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 29087726711..8e9ae902558 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -6,9 +6,9 @@
 #define ATOM_COMMON_ATOM_VERSION_H_
 
 #define ATOM_MAJOR_VERSION 3
-#define ATOM_MINOR_VERSION 1
-#define ATOM_PATCH_VERSION 0
-#define ATOM_PRE_RELEASE_VERSION -beta.1
+#define ATOM_MINOR_VERSION 0
+#define ATOM_PATCH_VERSION 10
+// #define ATOM_PRE_RELEASE_VERSION
 
 #ifndef ATOM_STRINGIFY
 #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
diff --git a/electron.gyp b/electron.gyp
index b71c1ca1d51..e5dc6e468f1 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '3.1.0-beta.1',
+    'version%': '3.1.0-beta.0',
     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
   },
   'includes': [
diff --git a/package-lock.json b/package-lock.json
index 796224c0584..bb74145fa9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "3.1.0",
+  "version": "3.1.0-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 97b7a834aa6..38872047707 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "3.1.0-beta.1",
+  "version": "3.1.0",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {