From b0ccd22c1c35bac16699282cad77e664f698126d Mon Sep 17 00:00:00 2001
From: Eliot Whalan <ewhal@pantsu.cat>
Date: Tue, 14 Jun 2016 18:27:36 +1000
Subject: Remove reverted commits from changelog

---
 CHANGELOG.md | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59fe000..18ba511 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,15 +38,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   Lapinlampi)
 - Output buffering (`ob_start`). This feature may be removed in the next
   major version. (Juuso Lapinlampi)
-<<<<<<< HEAD
-=======
-- JavaScript-free uploader (`nojs.html`). Use the upload API with external
-  tools. (Juuso Lapinlampi)
-- Other services page (`other.swig`). This page may be removed in the
-  next major version. (Juuso Lapinlampi)
-- HTML and text responses. Use other supported response types instead.
-  (Juuso Lapinlampi)
->>>>>>> parent of d22eba6... CHANGELOG: Update 2.1.0 up to 99fe3f0
 
 ### Fixed
 
-- 
cgit v1.2.3