From 177a5a8bdc6f94cc57f37aeb20608d3886bac1f7 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Sun, 12 Nov 2017 21:22:25 -0500
Subject: [PATCH] Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG
 a=release ba=release

--HG--
extra : histedit_source : 46923056fd09298724464a4df4466357821a361f
---
 CLOBBER                            | 2 +-
 browser/config/version.txt         | 2 +-
 browser/config/version_display.txt | 2 +-
 config/milestone.txt               | 2 +-
 services/sync/modules/constants.js | 2 +-
 xpcom/components/Module.h          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CLOBBER b/CLOBBER
index 912cc95bf2ae..04652348f9b5 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1413550 - Activity Stream removed a bunch of files that would break ./mach package
+Merge day clobber
diff --git a/browser/config/version.txt b/browser/config/version.txt
index f6531166fcbe..0cf4767cac8f 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-58.0a1
+59.0a1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
index f6531166fcbe..0cf4767cac8f 100644
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1 +1 @@
-58.0a1
+59.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index 97da264444f8..ce22df48431f 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-58.0a1
+59.0a1
diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js
index 0d648ff6a173..7e3ccad1073a 100644
--- a/services/sync/modules/constants.js
+++ b/services/sync/modules/constants.js
@@ -8,7 +8,7 @@ for (let [key, val] of Object.entries({
 
 // Don't manually modify this line, as it is automatically replaced on merge day
 // by the gecko_migration.py script.
-WEAVE_VERSION: "1.60.0",
+WEAVE_VERSION: "1.61.0",
 
 // Sync Server API version that the client supports.
 SYNC_API_VERSION:                      "1.5",
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index ded34dc642aa..5bb395f9797e 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -22,7 +22,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 58;
+  static const unsigned int kVersion = 59;
 
   struct CIDEntry;