Skip to content

Commit

Permalink
Fixed conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
sheeep committed Apr 12, 2013
2 parents b8811ba + 2a92723 commit 93c28aa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Resources/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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.

0 comments on commit 93c28aa

Please sign in to comment.