Merge branch 'develop' of github.com:ratiw/vuetable-2 into develop

ratiw · Jun 9, 2017 · a782656 · a782656
2 parents 4c71192 + d4bf8ec
commit a782656
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/dist/vuetable-2-full.js b/dist/vuetable-2-full.js
@@ -1,5 +1,13 @@
 /**
+<<<<<<< HEAD
  * vuetable-2 v1.6.4
+=======
+<<<<<<< HEAD
+ * vuetable-2 v1.6.4
+=======
+ * vuetable-2 v1.6.3
+>>>>>>> 97bca95424028bdcd233250a14dc7bee210d2670
+>>>>>>> d4bf8ec2e85ac291873b8a856ad62c42a3c71e64
  * https://github.com/ratiw/vuetable-2
  * Released under the MIT License.
  */