Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release…

… ba=release
Brli · Oct 22, 2018 · fc82567 · fc82567
1 parent 84f2527
commit fc82567
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/CLOBBER b/CLOBBER
@@ -22,5 +22,5 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1488813 - Migrating Pocket off any bootstrap code
 
+Merge day clobber
diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-64.0a1
+65.0a1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
@@ -1 +1 @@
-64.0a1
+65.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-64.0a1
+65.0a1
diff --git 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.66.0",
+WEAVE_VERSION: "1.67.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
@@ -23,7 +23,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 64;
+  static const unsigned int kVersion = 65;
 
   struct CIDEntry;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
     # hardcoded milestones in the tree from these two files.
     #--------------------------------------------------------
-.0a1
+.0a1