From adc67967395e1789d52a9fba4544aa30a8429617 Mon Sep 17 00:00:00 2001
From: cippaciong <lacapannadelloziotom@gmail.com>
Date: Thu, 21 Feb 2013 03:24:33 +0100
Subject: [PATCH] aur/owncloud 4.5.7-1

---
 aur/owncloud/PKGBUILD | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/aur/owncloud/PKGBUILD b/aur/owncloud/PKGBUILD
index 688d79b3f..0ce48682c 100644
--- a/aur/owncloud/PKGBUILD
+++ b/aur/owncloud/PKGBUILD
@@ -1,11 +1,7 @@
 # Maintainer: Antonio Rojas <nqn1976 @ gmail.com>
 # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
 
-<<<<<<< HEAD
 # ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com
-=======
-# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com>
->>>>>>> upstream/master
 
 pkgname=owncloud
 pkgver=4.5.7