From 181238d1de4940b13bef7a9db24cac9dfc6e9770 Mon Sep 17 00:00:00 2001
From: Eliot Whalan <ewhal@pantsu.cat>
Date: Tue, 14 Jun 2016 16:54:16 +1000
Subject: Revert "CHANGELOG: Update 2.1.0 up to 99fe3f0"

This reverts commit d22eba66c03ad823298dfacfaeb86754ea47427f.
---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18ba511..59fe000 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,15 @@ 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