Fixed conflict.

Author: sheeep

Resources/doc/index.md

@@ -86,7 +86,7 @@ oneup_uploader:
 
 ### Step 4: Prepare your frontend
 
-Currently the OneupUploaderBundle supports four different kind of frontends. ([FineUploader](http://fineuploader.com/), [jQuery File Uploader](http://blueimp.github.io/jQuery-File-Upload/), [YUI3 Uploader](http://yuilibrary.com/yui/docs/uploader/), [Uploadify](http://www.uploadify.com/)) No matter what library you choose, be sure to connect the corresponding endpoint property to the dynamic route created from your mapping. To get a url for a specific mapping you can use the `oneup_uploader.templating.uploader_helper` service as follows:
+No matter what library you choose, be sure to connect the corresponding endpoint property to the dynamic route created from your mapping. To get a url for a specific mapping you can use the `oneup_uploader.templating.uploader_helper` service as follows:
 
 ```php
 $helper = $this->container->get('oneup_uploader.templating.uploader_helper');
@@ -134,4 +134,4 @@ FineUploaders _delete Feature_ is using generated unique names we would have to
 
 > Why didn't you implement the _delete_ feature provided by another library?
 
-See the answer to the previous question and replace _FineUploader_ by the library you have chosen.
+See the answer to the previous question and replace _FineUploader_ by the library you have chosen.