[gnome-flashback] modulesets, 3.18: switch to main branch

[Alberts Muktupāvels <muktupavels src gnome org>]

commit b92c92286b617a0059f0b40ce468feb7922ca8c4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Jul 3 16:29:02 2015 +0300

    modulesets, 3.18: switch to main branch

 modulesets/gnome-flashback-3.18.modules |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-flashback-3.18.modules b/modulesets/gnome-flashback-3.18.modules
index 4cb82a3..8f0458e 100644
--- a/modulesets/gnome-flashback-3.18.modules
+++ b/modulesets/gnome-flashback-3.18.modules
@@ -3,12 +3,12 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes" href="git://git.gnome.org/" />
-  <repository type="bzr" name="launchpad.net" href="lp:" 
branches-template="~albertsmuktupavels/%(module)s/%(branch)s" />
+  <repository type="bzr" name="launchpad.net" href="lp:" branches-template="%(module)s" />
 
   <include href="https://git.gnome.org/browse/jhbuild/plain/modulesets/gnome-world.modules"; />
 
   <cmake id="compiz" force-non-srcdir-builds="yes" cmakeargs="-DUSE_GCONF=OFF">
-    <branch repo="launchpad.net" module="compiz" branch="gwd-support-metacity-3-16" />
+    <branch repo="launchpad.net" module="compiz" />
     <dependencies>
       <dep package="boost" />
       <dep package="cairo" />