From d047988d07615629acbeae8fe7345b93c168b4ed Mon Sep 17 00:00:00 2001
From: Gilbert Kennen <gilbert@firewatcher.org>
Date: Sat, 25 Jul 2015 07:44:18 -0700
Subject: [PATCH] reenabled magit-gitflow for magit 2.1

---
 contrib/!source-control/git/packages.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/!source-control/git/packages.el b/contrib/!source-control/git/packages.el
index bb1804f3b..e489b82f9 100644
--- a/contrib/!source-control/git/packages.el
+++ b/contrib/!source-control/git/packages.el
@@ -20,8 +20,7 @@
         git-timemachine
         helm-gitignore
         magit
-        ;; not compatible with magit 2.1 at the time of release
-        ;; magit-gitflow
+        magit-gitflow
         ;; not compatible with magit 2.1 at the time of release
         ;; magit-svn
         smeargle