...

cowtowncoder · cowtowncoder · commit 68d3aa40791a · 2019-07-25T22:30:51.000-07:00
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -3,11 +3,7 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
-<<<<<<< HEAD
 2.8.11.4 (not released)
-=======
-2.7.9.6 (26-Jul-2019)
->>>>>>> 2.7
 
 #2326: Block one more gadget type (CVE-2019-12086)
 #2334: Block class for CVE-2019-12384
