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

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