From f151376ad5beff46043645578add910b7e98a0f0 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Sat, 27 Oct 2012 17:05:00 +0200
Subject: remove remaining line from merge conflict

---
 apps/files_versions/lib/versions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 56664427fb8..2f27cd0e667 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -275,5 +275,4 @@ class Storage {
 		$view = \OCP\Files::getStorage('files_versions');
 		return $view->deleteAll('', true);
 	}
-}
->>>>>>> 12ea922... fix broken paths in versions app
+}
-- 
cgit v1.2.3