From 3ca301da1d2f06177f975109bc770939efe252f6 Mon Sep 17 00:00:00 2001 From: Theophilix Date: Thu, 26 Sep 2019 22:07:09 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d37d52a..deb02a4 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,6 @@ Please post all feature requests in the issues tab. ## II Version history -<<<<<<< HEAD ======= **For version 4.7.9:** @@ -85,7 +84,6 @@ Please post all feature requests in the issues tab. - bugfix: Frontend: Frontend: No calendar picker when editing date cells https://github.com/Theophilix/event-table-edit/issues/152 ->>>>>>> parent of ff292d5... Revert "Bugfix 4.7.9 calendar picker" **For version 4.7.8:** [1] Normal mode From 61e29fbf1c06ac6e1c1a9d309f732d1f2dfa7c8e Mon Sep 17 00:00:00 2001 From: Theophilix Date: Thu, 26 Sep 2019 22:07:49 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index deb02a4..1d02fe0 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,6 @@ Please post all feature requests in the issues tab. ## II Version history -======= **For version 4.7.9:** [1] Normal mode