From d86dfb9332bb1067cbf15fe2c0bc0a67bea5f605 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 10 Aug 2008 17:22:02 +0200
Subject: Revert to master branch (to ease merging).

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9082822..4f3fe1e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SOURCES = ikiwiki
 # Git origin (with capital MOULE replaced or stripped as needed)
 ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
 # Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed)
-ikiwiki_BRANCH = clean-FLAVOR-LOCALE
+ikiwiki_BRANCH = master-FLAVOR-LOCALE
 # modules (subproject extension names) used.  Expands Git ORIGINs
 ikiwiki_MODULES = templates basewiki smiley
 # flavors used.  Expands Git BRANCHes
-- 
cgit v1.2.3