restheart.yml contains an unresolved merge conflict

SoftInstigate / restheart-blog-example

Example blog application built with RESTHeart and AngularJS

GNU Affero General Public License v3.0

9 stars 6 forks source link

Closed shful closed 9 years ago

shful commented 9 years ago

... in commit 9073b223d7.

mkjsix commented 9 years ago

It should be fine now, but we need some additional testing. Please let me know if you have any issue.