From 7a28608e95dc4589a73a8922ee5dade1baca8a23 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 3 Jun 2015 13:13:54 +0000 Subject: [PATCH] Don't merge personal/rjs/v6.0.4.dev0@9647 - Legacy-Id: 9655 --- hold-for-merge | 1 + 1 file changed, 1 insertion(+) diff --git a/hold-for-merge b/hold-for-merge index 233bdac0b..247f355a5 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,6 @@ # -*- conf-mode -*- +personal/rjs/v6.0.4.dev0@9647 # Commit contained too much. Later corrected commit will be marked for merge personal/rcross/v5.7.3-dev0@8640 # Rework: make the check_permissions() decorator handle the case where the user isn't logged in personal/rcross/v5.6.3-dev0@8237 # Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead personal/liudapeng/v5.5.1-dev0@7925 # alternative resolution desired