[nongnu] elpa/org-journal 86ba689626 1/4: Oops, remove CHANGELOG duplicates and remove merge commits

[ELPA Syncer]

branch: elpa/org-journal
commit 86ba689626fa1d4126cb492d910d17fb621b3389
Author: Christian Schwarzgruber <c.schwarzgruber.cs@gmail.com>
Commit: Christian Schwarzgruber <c.schwarzgruber.cs@gmail.com>

    Oops, remove CHANGELOG duplicates and remove merge commits
    
    [skip ci]
---
 CHANGELOG | 101 --------------------------------------------------------------
 1 file changed, 101 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ca77d60997..b47645d90c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -55,19 +55,14 @@
   - Argument scheduled-time is a list not a string and cannot be passed to 
org-time-string-to-time (Christian Schwarzgruber)
   - [tests] Move daily carryover tests to subdirectory (Christian 
Schwarzgruber)
   - Prepare for next patch release (Christian Schwarzgruber)
-  - Merge branch 'pr-322' (Christian Schwarzgruber)
   - Add test to proof that 7 is correct for Sunday week start (Christian 
Schwarzgruber)
   - Try to reproduce #309 (Christian Schwarzgruber)
   - Define edebug spec for debugging (Christian Schwarzgruber)
   - Fix "start on sunday" issue (aragaer)
-  - Merge pull request #320 from daveduthie/master (Christian Schwarzgruber)
   - Add missing third arg to `define-obsolete-function-alias` (David Duthie)
-  - Merge pull request #314 from emiltoacs/master (Bastian Bechtold)
   - Solve error when org-journal-dir has symlink in the path (emiltoacs)
-  - Merge pull request #310 from lamb003/patch-1 (Christian Schwarzgruber)
   - Fixed small typo (Chad Lamb)
   - Add function `org-journal-reschedule-scheduled-entry` (Resolve #300) 
(Christian Schwarzgruber)
-  - Merge pull request #307 from june3474/old-carryover (Christian 
Schwarzgruber)
   - Fix example in README.org (dks)
   - Terminology Consistency (dks)
   - Enable to do custom actions for old carryover entries (dks)
@@ -76,18 +71,14 @@
   - Add -L to follow new location (Christian Schwarzgruber)
   - Add test for #304 (Christian Schwarzgruber)
   - Fix #304 (Christian Schwarzgruber)
-  - Merge README enhancement from  brabalan/patch-1 (Christian Schwarzgruber)
   - Adjust #303 (Resolves #302) (Christian Schwarzgruber)
-  - Merge remote-tracking branch 'brabalan/patch-1' (Christian Schwarzgruber)
   - Org capture integration for future scheduled task (Alan Schmitt)
   - Fix regression introduced in a75aee3 (Fix #294, Fix #295) (Christian 
Schwarzgruber)
-  - Merge README org-capture improvement 'pr-293' (Christian Schwarzgruber)
   - Simplify org-capture integration section in README (Christian 
Schwarzgruber)
   - org-collect-keywords has a different signature (Fix #289) (Christian 
Schwarzgruber)
   - Add capture integration example for monthly journal (Sébastien Lerique)
   - Add section -- Contributing to org-journal -- to README (Christian 
Schwarzgruber)
   - Silent byte-compiler (Christian Schwarzgruber)
-  - Merge branch 'sort-dates' (Christian Schwarzgruber)
   - Fix indentation (Christian Schwarzgruber)
   - Updated org-journal-sort-dates to use prev arg (Jay)
   - Moved sort logic of dates from open-entry into new func (Jay)
@@ -99,100 +90,8 @@
   - Patch release (2.1.1) (Christian Schwarzgruber)
   - Only delete drawers once when carrying over todos (Fix #267) (Christian 
Schwarzgruber)
   - Make it clear which functions/variables are for internal use only 
(Christian Schwarzgruber)
-  - Merge pull request #288 from ja0nz/add-iso-week-format-code (Christian 
Schwarzgruber)
   - Added '%V' shortcode to the format-rx-alist and documentation (Ja0nz)
   - Keep time intact when updating timestamps on carryover (Fix #285) 
(Christian Schwarzgruber)
-  - Merge fix for handling new org-agenda-files (Christian Schwarzgruber)
-  - Use org-store-new-agenda-file-list to manipulate org-agenda-files (Stig 
Brautaset)
-  - Remove keys from hash when files do not exists anymore (Fix #279) 
(Christian Schwarzgruber)
-  - Fix doc string (Christian Schwarzgruber)
-  - Add new defcustom org-journal-prefix-key (Resolve #255) (Christian 
Schwarzgruber)
-  - Follow the convention - don't end error messages with a dot (Christian 
Schwarzgruber)
-  - Use user-error instead error where it is more appropriate (Christian 
Schwarzgruber)
-  - Update documentation strings (Christian Schwarzgruber)
-  - Simplify cl-loop's in org-journal-carryover (Christian Schwarzgruber)
-  - Remove unnecessary variable bindings in org-journal-open-entry (Christian 
Schwarzgruber)
-  - Redesign org-journal-invalidate-cache (Christian Schwarzgruber)
-  - Don't modify original list in org-journal-open-entry (Christian 
Schwarzgruber)
-  - Remove all dates first which belong to the file being added to the hash 
table (Christian Schwarzgruber)
-  - Check if there are new journal files after verifying the modification time 
(Christian Schwarzgruber)
-  - Update documentation (Christian Schwarzgruber)
-  - Fix possible error when org-journal-dir is a symlink when creating the 
org-journal-dir (Christian Schwarzgruber)
-  - Use a single hash table for dates/files (Christian Schwarzgruber)
-  - Fix tests (Christian Schwarzgruber)
-  - Sort return value of hash-table-values; oldest -> newest (Fix #272) 
(Christian Schwarzgruber)
-
-2.1.2 / 2021-01-27
-==================
-
-  - Ignore org-journal-autoloads.el (Christian Schwarzgruber)
-  - Update CONTRIBUTORS file (Christian Schwarzgruber)
-  - Update CHANGELOG file with missing 2.1.1 changes (Christian Schwarzgruber)
-  - Adapt CHANGELOG file for new format (Christian Schwarzgruber)
-  - Add new internal function org-journal--sanity-checks (Christian 
Schwarzgruber)
-  - Rename org-journal--dir-check-or-create to org-journal--create-journal-dir 
(Christian Schwarzgruber)
-  - Re-factor org-journal-new-entry (Christian Schwarzgruber)
-  - Rename org-journal--org-heading-p to 
org-journal--is-date-prefix-org-heading-p (Christian Schwarzgruber)
-  - Mark org-journal-delete-old-carryover public by replacing -- with - 
(Christian Schwarzgruber)
-  - More work on doc-strings (Christian Schwarzgruber)
-  - Resolve #323 (aragaer)
-  - Add test for #323 and fix small bug in org-journal-new-date-entry 
(Christian Schwarzgruber)
-  - Formatting (Christian Schwarzgruber)
-  - Fix doc-string warnings (Christian Schwarzgruber)
-  - Add fixme to test case (Christian Schwarzgruber)
-  - Move yearly test to subdirectory too (Christian Schwarzgruber)
-  - Kill any left over buffers after the ert test failed on next execution 
(Christian Schwarzgruber)
-  - Argument scheduled-time is a list not a string and cannot be passed to 
org-time-string-to-time (Christian Schwarzgruber)
-  - [tests] Move daily carryover tests to subdirectory (Christian 
Schwarzgruber)
-  - Prepare for next patch release (Christian Schwarzgruber)
-  - Merge branch 'pr-322' (Christian Schwarzgruber)
-  - Add test to proof that 7 is correct for Sunday week start (Christian 
Schwarzgruber)
-  - Try to reproduce #309 (Christian Schwarzgruber)
-  - Define edebug spec for debugging (Christian Schwarzgruber)
-  - Fix "start on sunday" issue (aragaer)
-  - Merge pull request #320 from daveduthie/master (Christian Schwarzgruber)
-  - Add missing third arg to `define-obsolete-function-alias` (David Duthie)
-  - Merge pull request #314 from emiltoacs/master (Bastian Bechtold)
-  - Solve error when org-journal-dir has symlink in the path (emiltoacs)
-  - Merge pull request #310 from lamb003/patch-1 (Christian Schwarzgruber)
-  - Fixed small typo (Chad Lamb)
-  - Add function `org-journal-reschedule-scheduled-entry` (Resolve #300) 
(Christian Schwarzgruber)
-  - Merge pull request #307 from june3474/old-carryover (Christian 
Schwarzgruber)
-  - Fix example in README.org (dks)
-  - Terminology Consistency (dks)
-  - Enable to do custom actions for old carryover entries (dks)
-  - Really fix #304 (Christian Schwarzgruber)
-  - adding daily files for testing (Alan Schmitt)
-  - Add -L to follow new location (Christian Schwarzgruber)
-  - Add test for #304 (Christian Schwarzgruber)
-  - Fix #304 (Christian Schwarzgruber)
-  - Merge README enhancement from  brabalan/patch-1 (Christian Schwarzgruber)
-  - Adjust #303 (Resolves #302) (Christian Schwarzgruber)
-  - Merge remote-tracking branch 'brabalan/patch-1' (Christian Schwarzgruber)
-  - Org capture integration for future scheduled task (Alan Schmitt)
-  - Fix regression introduced in a75aee3 (Fix #294, Fix #295) (Christian 
Schwarzgruber)
-  - Merge README org-capture improvement 'pr-293' (Christian Schwarzgruber)
-  - Simplify org-capture integration section in README (Christian 
Schwarzgruber)
-  - org-collect-keywords has a different signature (Fix #289) (Christian 
Schwarzgruber)
-  - Add capture integration example for monthly journal (Sébastien Lerique)
-  - Add section -- Contributing to org-journal -- to README (Christian 
Schwarzgruber)
-  - Silent byte-compiler (Christian Schwarzgruber)
-  - Merge branch 'sort-dates' (Christian Schwarzgruber)
-  - Fix indentation (Christian Schwarzgruber)
-  - Updated org-journal-sort-dates to use prev arg (Jay)
-  - Moved sort logic of dates from open-entry into new func (Jay)
-  - Fix #289 (Christian Schwarzgruber)
-
-2.1.1 / 2020-08-23
-==================
-
-  - Patch release (2.1.1) (Christian Schwarzgruber)
-  - Only delete drawers once when carrying over todos (Fix #267) (Christian 
Schwarzgruber)
-  - Make it clear which functions/variables are for internal use only 
(Christian Schwarzgruber)
-  - Merge pull request #288 from ja0nz/add-iso-week-format-code (Christian 
Schwarzgruber)
-  - Added '%V' shortcode to the format-rx-alist and documentation (Ja0nz)
-  - Keep time intact when updating timestamps on carryover (Fix #285) 
(Christian Schwarzgruber)
-  - Merge fix for handling new org-agenda-files (Christian Schwarzgruber)
   - Use org-store-new-agenda-file-list to manipulate org-agenda-files (Stig 
Brautaset)
   - Remove keys from hash when files do not exists anymore (Fix #279) 
(Christian Schwarzgruber)
   - Fix doc string (Christian Schwarzgruber)