fixes

dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright 1999-2017 Gentoo Foundation
-=======
 # Copyright 2020 Gentoo Authors
->>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,14 +15,9 @@ then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
 else
-<<<<<<< HEAD
-    SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
-    KEYWORDS="~amd64 ~x86"
-=======
 	SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/libqtolm-v${PV}"
->>>>>>> upstream/master
 fi
 
 LICENSE="GPL-3"
@@ -37,17 +28,11 @@ RDEPEND=""
 DEPEND="
 	${RDEPEND}
 	dev-qt/qtcore
-<<<<<<< HEAD
-	dev-libs/olm"
-	
-S="${WORKDIR}"/libqtolm-v3.0.1
-=======
 	dev-libs/olm
 "
->>>>>>> upstream/master
 
 src_configure() {
-    local mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 	)
 	cmake-utils_src_configure

dev-libs/libQtOlm/libQtOlm-9999.ebuild

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright 1999-2017 Gentoo Foundation
-=======
 # Copyright 2020 Gentoo Authors
->>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

dev-libs/libQuotient/libQuotient-0.6_beta1.ebuild

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright 1999-2017 Gentoo Foundation
-=======
 # Copyright 2020 Gentoo Authors
->>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,26 +8,14 @@ HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake-utils
 
-<<<<<<< HEAD
-
-if [[ ${PV} == "9999" ]];
-then
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
-=======
 MY_PV="$(ver_rs 2 '-')"
 
 if [[ ${PV} == "9999" ]]; then
->>>>>>> upstream/master
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
 else
-<<<<<<< HEAD
-     SRC_URI="https://github.com/quotient-im/libQuotient/archive/0.6-beta1.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-=======
 	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
->>>>>>> upstream/master
 fi
 
 LICENSE="GPL-3"

dev-libs/libQuotient/libQuotient-9999.ebuild

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright 1999-2017 Gentoo Foundation
-=======
 # Copyright 2020 Gentoo Authors
->>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

dev-libs/olm/olm-3.1.4.ebuild

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright 1999-2019 Gentoo Foundation
-=======
 # Copyright 2020 Gentoo Authors
->>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

net-im/spectral/spectral-854.ebuild

@@ -8,11 +8,7 @@ HOMEPAGE="https://gitlab.com/spectral-im/spectral"
 
 inherit  cmake-utils
 
-<<<<<<< HEAD
-COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.zip"
-=======
 COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
->>>>>>> upstream/master
 
 if [[ ${PV} == 9999 ]]
 then
@@ -49,21 +45,6 @@ DEPEND="
 "
 
 src_prepare() {
-<<<<<<< HEAD
-   move_lib() {
-      local IN_DIR="${1}"
-      local OUT_DIR
-      [ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR="${2%/}/${IN_DIR}"
-      mv "${WORKDIR}/${IN_DIR}"*/* "${S}/${OUT_DIR}" || die
-   }
-
-   local thirdparty_libs=" SortFilterProxyModel" 
-   for thirdparty_lib in ${thirdparty_libs} ; do
-      move_lib "${thirdparty_lib}" include
-   done
-
-   cmake-utils_src_prepare
-=======
 	if [[ ${PV} != 9999 ]]
 	then
 		move_lib() {
@@ -79,7 +60,6 @@ src_prepare() {
 	fi
 
 	cmake-utils_src_prepare
->>>>>>> upstream/master
 }
 
 pkg_postinst() {