docs(cn): fix conflicts

windicss · Oct 14, 2021 · 432eefc · 432eefc
1 parent a0c6960
commit 432eefc
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/plugins/community/animations.md b/plugins/community/animations.md
@@ -16,13 +16,8 @@ export default {
     // ...
   },
   plugins: [
-<<<<<<< HEAD
     // 其他插件
-    require('@windicss/animations')({
-=======
-    // Other plugins
     require('@windicss/plugin-animations')({
->>>>>>> 5d715aec835ce49c42335f0f65bda9739b76ffec
       settings: {
         animatedSpeed: 1000,
         heartBeatSpeed: 1000,