changelog

PerlDancer · Mar 6, 2018 · 4010127 · 4010127
1 parent 077e104
commit 4010127
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/Changes b/Changes
@@ -31,7 +31,6 @@ Revision history for Dancer2-Session-Memcached
   [ STATISTICS ]
     - code churn: 4 files changed, 96 insertions(+), 38 deletions(-)
 
-<<<<<<< HEAD
 0.004     2016-07-07
 
     - Bump Dancer2 dependency to 0.150000 (Core::Context removal)
@@ -42,16 +41,6 @@ Revision history for Dancer2-Session-Memcached
 
 0.003     2013-04-10 17:31:39 Europe/London
 
-    [FIXED]
-=======
-0.004 2016-07-07
-  - Bump Dancer2 dependency to 0.150000 (Core::Context removal)
-  - Small dzil cleanup
-  - Convert tests from Test::TCP to Plack::Test
-  - add _change_id method for upcoming change_session_id method in
-    Dancer2::Core::App
->>>>>>> ff0653f... v0.006
-
     - Fixed up test bugs for latest Dancer2 session factory changes
 
 0.002     2013-02-23 22:19:08 America/New_York