From cf8ea0803ef5e423d8456d4bbb64bac777d349ed Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Sun, 16 Feb 2014 01:02:35 -0700 Subject: [PATCH] Changelog --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ba2ea7db..fe14db7c8 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD **MayhemYDG**: - Added a `Reset Settings` button in the settings. - More stability update. @@ -6,7 +5,7 @@ **ParrotParrot**: - Added `Original filename` variable to Sauce panel. -======= + ### v1.3.7 *2014-02-15* @@ -53,7 +52,6 @@ ### v1.3.2 *2014-01-12* ->>>>>>> 7a7d0ec6860866e71e728aa9b41b1994fe1b5950 **seaweedchan**: - Fix Menu errors on older Firefox versions, such as the ESR