removed some files

edtalmadge · Jan 19, 2013 · cdce6d1 · cdce6d1
2 parents 2b4e5ac + 2ba9976
commit cdce6d1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/readme.MARKDOWN b/readme.MARKDOWN
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 About
 =============
 
@@ -11,3 +12,14 @@ View Examples
 
 <a href="http://agilecarousel.com/#examples">![View Slideshow Examples](http://agilecarousel.com/images/viewExamplesBanner.jpg "View Slideshow Examples")</a>
 
+=======
+<p>About<br>
+  =============</p>
+<p>Agile Carousel is a JQuery Plugin that allows you to create a slideshow or carosuel.<br>
+  Highly customizable so you can build according to your requirements. JSON data format is used.<br>
+  See full documentation at http://www.agilecarousel.com!</p>
+<p>View Examples<br>
+  =============<br>
+</p>
+<p><a href="http://agilecarousel.com/#examples">![View Slideshow Examples](http://agilecarousel.com/images/viewExamplesBanner.jpg "View Slideshow Examples")</a></p>
+>>>>>>> 2ba9976f5b08fee433db4d930c422191382b0b44
diff --git a/readme.txt b/readme.txt
diff --git a/readme.txt~ b/readme.txt~