fix: fixed nolimits4web#2807

dalai0302 · Feb 26, 2019 · 29f82dc · 29f82dc
2 parents d6b96fd + 21ba951
commit 29f82dc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/components/core/update/updateActiveIndex.js b/src/components/core/update/updateActiveIndex.js
@@ -53,6 +53,10 @@ export default function (newActiveIndex) {
   if (previousRealIndex !== realIndex) {
     swiper.emit('realIndexChange');
   }
+<<<<<<< HEAD
+=======
+
+>>>>>>> 21ba9512ee7b540971bdc12db913543baeb140f7
   if (swiper.initialized || swiper.runCallbacksOnInit) {
     swiper.emit('slideChange');
   }