Trunctuate changelog

2013-08-16 03:47:56 -07:00 · 2013-08-16 03:47:56 -07:00 · 05141445fa
commit 05141445fa
parent 298b5d3270
1 changed files with 0 additions and 16 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,21 +1,5 @@
-<<<<<<< HEAD
 ### v2.3.3 
 *2013-08-16*
-=======
-**seaweedchan**:
-
-![Board title editing in action](src/General/img/changelog/1.2.31.png)
-
- Ported `Custom Board Titles` feature from Appchan X (with Zixaphir)
-  - This allows you to edit the board title and subtitle in real-time by ctrl+clicking them
- Ported ability to change to a new random banner image on click from Appchan X
-
-**Zixaphir**:
- Small linkifier fix
-
-### v1.2.30 
-*2013-08-15*
->>>>>>> v3

 **seaweedchan**:
 - Fix Color User IDs