Merge branch 'master' of github.com:grid-js/gridjs-vue

Signed-off-by: Daniel Sieradski <[email protected]> # Conflicts: # CHANGELOG.md
grid-js · Jun 8, 2021 · 30e2894 · 30e2894
2 parents b55284d + c799600
commit 30e2894
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,23 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+<<<<<<< HEAD
 ## [5.0.1] - 2021-06-08
+=======
+## [Unreleased]
+>>>>>>> c79960086ab0839845244181cca100eee03ca65e
 
 - Major update!
 - Changed semantic versioning to match version of Grid.js on which it is built to work
 - Moved entirely to an ES6 module
 - Dropped npm dependencies in favor of unpkg so it can be used entirely on the frontend without bundlers
 - Removed inessential dependencies and lightened the weight of others
 - Simplified the testing procedure
+<<<<<<< HEAD
 
 ## [4.0.0] - 2020-07-14
+=======
+>>>>>>> c79960086ab0839845244181cca100eee03ca65e
 
 ## [0.4.1] - 2020-07-14