fix merge conflict

1 files changed, 13 insertions, 0 deletions

diff --git a/external_api/feed.php b/external_api/feed.php
index 7dfd5763f..a56cd2253 100644
--- a/external_api/feed.php
+++ b/external_api/feed.php
@@ -25,6 +25,19 @@ class FeedApi {
 		return new \OC_OCS_Result($serializedFeed);
 	}
 	
+	public function delete($params) {
+		//TODO: check parameters here
+
+		$success = $this->bl->delete($params["feedid"]);
+
+		if ($success) {
+			return new \OC_OCS_Result();
+		}
+		else {
+			return new \OC_OCS_Result(null, 101);
+		}
+	}
+
 	public function create() {
 		$url = $_POST['url'];
 		$folderId = $_POST['folderid'];