Updated changelog & removed junk file.

diff --git a/; b/;
deleted file mode 100644 (file)
index 0112601..0000000
--- a/;
+++ /dev/null
@@ -1,12 +0,0 @@
-Modify package scripts for 1.5
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-# On branch master
-# Changes to be committed:
-#   (use "git reset HEAD <file>..." to unstage)
-#
-#      modified:   package_scripts/deb/amd64/control
-#      modified:   package_scripts/deb/build.sh
-#      modified:   package_scripts/deb/i386/control
-#      modified:   package_scripts/tar/build.sh
-#

diff --git a/changelog.txt b/changelog.txt
index 4f7a952..5eac388 100644 (file)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,15 +1,15 @@
+NixNote (1.6) stable; urgency=high
+  * Correct minor bug with linked accounts.
+  * Switch to new authentication key per Evernote's request
+
 NixNote (1.5) stable; urgency=high
   * Correct bug causing repeted deletion errors on Evernote servers.
   * Correct bug causing notes to be marked as unsynchronized when tags have been updated.
   * Correct various oauth errors.
 
-<<<<<<< HEAD
 NixNote (1.4) stable; urgency=low
   * Corrected error synchronizing linked accounts.
   * Switched to new authentication key per Evernote's request.
-=======
->>>>>>> c3e49e158d87c0988e908b2de0849464fa8ad38e
-NixNote (1.4) stable; urgency=low
   * Added better proxy support for OAuth
   * Search text dialog box won't clear if clicking "all notes".
   * Tag names are taken into account when searching text (changed or new notes only).