@websy/websy-designs 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -22,11 +22,8 @@
22
22
  APIService
23
23
  ButtonGroup
24
24
  WebsyUtils
25
- <<<<<<< HEAD
26
25
  WebsyCarousel
27
- =======
28
26
  Pager
29
- >>>>>>> master
30
27
  */
31
28
 
32
29
  /* global XMLHttpRequest fetch ENV */