Skip to content
Browse files

readme

  • Loading branch information...
1 parent eca2212 commit 420a2dbbc13d457276f340fc1bdb3a40f96a928d @wolfv committed
Showing with 1 addition and 6 deletions.
  1. +1 −6 README.md
View
7 README.md
@@ -7,7 +7,6 @@ A simple, yet versatile field for nice textediting in the Silverstripe CMS. It's
Features:
Suggest Link: `[Testlink](:` leads to an autosuggest-field.
-<<<<<<< HEAD
Suggest Image: `![Image Description](!` opens an image-autosuggest field.
Getting the markdown editor field as a replacement for TinyMCE is easy:
@@ -31,11 +30,7 @@ $(document).ready(function() {
More examples are on [http://softwaremaniacs.org/soft/highlight/en/description/](http://softwaremaniacs.org/soft/highlight/en/description/) (All credit to them)
-The Markdown Logo was made by Dustin Curtis. All other icons were made by Orman Clark [Premium Pixels](http://www.premiumpixels.com)
-=======
-Suggest Image: `[Image Description](!` opens an image-autosuggest field.
---
-Credits for Markdown Logo go to Dustin Curtis. All other icons were made by Orman Clark [Premium Pixels](http://www.premiumpixels.com)
->>>>>>> dbd28e79c3ee8754086350fd3747a5ae2b4877b6
+The Markdown Logo was made by Dustin Curtis. All other icons were made by Orman Clark [Premium Pixels](http://www.premiumpixels.com)

0 comments on commit 420a2db

Please sign in to comment.
Something went wrong with that request. Please try again.