summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 17:22:02 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 17:22:02 +0200
commitd86dfb9332bb1067cbf15fe2c0bc0a67bea5f605 (patch)
tree314ec896ab29bd9fbdf2a33010b4afc75bd447d6
parent53991a00b7a53c10646c5757835cbf66bbcc93da (diff)
Revert to master branch (to ease merging).
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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