From 848d16525f7fa6da263d672f6082b9369a4250ec Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Tue, 26 Feb 2019 15:20:32 -0800 Subject: [PATCH] Revert "Bump v6.0.0-nightly.20190226" This reverts commit 7c78f11b8243f46b8a28ba6bdbc271ead95b51e0. --- ELECTRON_VERSION | 2 +- atom/browser/resources/mac/Info.plist | 4 ++-- atom/browser/resources/win/atom.rc | 4 ++-- atom/common/atom_version.h | 2 +- package-lock.json | 11 +++++++---- package.json | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index fc6b9a2b726e..b5778ea063c5 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -6.0.0-nightly.20190226 \ No newline at end of file +6.0.0-nightly.20190213 \ No newline at end of file diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist index 975b48aff546..8b3c13d59be7 100644 --- a/atom/browser/resources/mac/Info.plist +++ b/atom/browser/resources/mac/Info.plist @@ -17,9 +17,9 @@ CFBundleIconFile electron.icns CFBundleVersion - 6.0.0-nightly.20190226 + 6.0.0-nightly.20190213 CFBundleShortVersionString - 6.0.0-nightly.20190226 + 6.0.0-nightly.20190213 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index c7a98fd467b1..099ed819b3fc 100644 --- a/atom/browser/resources/win/atom.rc +++ b/atom/browser/resources/win/atom.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,0,0,20190226 - PRODUCTVERSION 6,0,0,20190226 + FILEVERSION 6,0,0,20190213 + PRODUCTVERSION 6,0,0,20190213 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index 6ed961faec17..3ee4ab777457 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -9,7 +9,7 @@ #define ATOM_MINOR_VERSION 0 #define ATOM_PATCH_VERSION 0 // clang-format off -#define ATOM_PRE_RELEASE_VERSION -nightly.20190226 +#define ATOM_PRE_RELEASE_VERSION -nightly.20190213 // clang-format on #ifndef ATOM_STRINGIFY diff --git a/package-lock.json b/package-lock.json index 77ba579fc931..c58202f93e4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "6.0.0-nightly.20190226", + "version": "6.0.0-nightly.20190213", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -298,6 +298,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2284,7 +2285,8 @@ "version": "0.3.6", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz", "integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==", - "dev": true + "dev": true, + "optional": true }, "cssstyle": { "version": "0.2.37", @@ -7643,7 +7645,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "longest-streak": { "version": "2.0.2", @@ -13544,4 +13547,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 50f55a71623b..c3e56a5f4641 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "6.0.0-nightly.20190226", + "version": "6.0.0-nightly.20190213", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { @@ -113,4 +113,4 @@ "git add filenames.auto.gni" ] } -} \ No newline at end of file +}