Add cbsh-welcome to repos

x86_64/cbsh-session-manager/PKGBUILD

@@ -4,13 +4,22 @@ _pkgname=cbsh-session-manager
 pkgver=1.0.r9.5bd8cb0
 pkgrel=1
 epoch=
+<<<<<<< HEAD
 pkgdesc="A Basic Session Manager Specific for CBSH"
+=======
+pkgdesc="A Simple Session manager for CBSH"
+>>>>>>> 933c2e5 (Add cbsh-welcome to repos)
 arch=('x86_64')
 url="https://www.gitlab.com/cbsh/cbsh-session-manager.git"
 license=('GPL3')
 groups=()
+<<<<<<< HEAD
 depends=(python-gobject gtk3)
 makedepends=(git)
+=======
+depends=()
+makedepends=(git python-build python-installer python-wheel)
+>>>>>>> 933c2e5 (Add cbsh-welcome to repos)
 checkdepends=()
 optdepends=()
 provides=(cbsh-session-manager)
@@ -35,7 +44,11 @@ build() {
 }
 
 package() {
+<<<<<<< HEAD
     cd cbsh-session-manager
+=======
+    cd "${_pkgname}"
+>>>>>>> 933c2e5 (Add cbsh-welcome to repos)
     python -m installer --destdir="$pkgdir" dist/*.whl
 
     install -Dm775 cbsh-session-manager "${pkgdir}/usr/local/bin/cbsh-session-manager"