From f652daa3d92d0a5401b45e8b77cc2cfbb42023bd Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Fri, 8 Mar 2013 14:50:10 +0100
Subject: fix merge conflict

---
 feed.bl.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'feed.bl.php')

diff --git a/feed.bl.php b/feed.bl.php
index 0ddd8ac80..43e0faf6f 100644
--- a/feed.bl.php
+++ b/feed.bl.php
@@ -16,6 +16,10 @@ class FeedBl {
 		return $this->feedMapper->findById($feedid);
 	}
 	
+	public function delete($feedid) {
+		return $this->feedMapper->deleteById($feedid);
+	}
+
 	public function create($url, $folderid) {
 		$feed = new Feed($url);
 		$this->feedMapper->save($feed, $folderid);
-- 
cgit v1.2.3