merging

sheikalthaf · Jun 10, 2017 · d9837a9 · d9837a9
2 parents af273a3 + 8fdc6ef
commit d9837a9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -55,8 +55,12 @@ type: milli seconds
 
 # data-speed
 ```
+<<<<<<< HEAD
 type:  milli seconds,
 default: 300
+=======
+type:  milli seconds
+>>>>>>> 8fdc6ef5132bc404c1f607a5fe3afe993ee1e77a
 ```
 (eg. data-speed="300")
 
@@ -66,4 +70,8 @@ Hope you guys enjoying the Rescarousel
 
 if you find any bug let me know i will try to solve as much as possible
 
-> # By CreativeTechSoft
+<<<<<<< HEAD
+> # By CreativeTechSoft
+=======
+> # By CreativeTechSoft
+>>>>>>> 8fdc6ef5132bc404c1f607a5fe3afe993ee1e77a
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/js/resCarousel.min.js b/js/resCarousel.min.js