From 6ca9b306bd64ffa83ef92a2f4b0ef14ebc6fdd21 Mon Sep 17 00:00:00 2001
From: ffxbld <release@mozilla.com>
Date: Mon, 8 Jul 2019 17:27:36 +0000
Subject: [PATCH] Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG
 a=release ba=release

---
 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 298b60709066..d4cdfaff33de 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 1555661 - Clobber due to search engine file removals (bug 1552120)
+Merge day clobber
\ No newline at end of file
diff --git a/browser/config/version.txt b/browser/config/version.txt
index c9a9644138c7..b109d50e9e98 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-69.0a1
+70.0a1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
index c9a9644138c7..b109d50e9e98 100644
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1 +1 @@
-69.0a1
+70.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index 4894369aba70..1be7b8ec0695 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-69.0a1
+70.0a1
diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js
index f9b3dc864206..ac33ec7f204b 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.71.0",
+WEAVE_VERSION: "1.72.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 c4fe5d36961b..c73c45b3d68d 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
  * via a module loader.
  */
 struct Module {
-  static const unsigned int kVersion = 69;
+  static const unsigned int kVersion = 70;
 
   struct CIDEntry;