summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarley Wiltzer2016-08-28 12:29:26 -0400
committerHarley Wiltzer2016-08-28 12:29:26 -0400
commit36ecef1d06eb733c3d14a4b5ddb615335206088e (patch)
tree2f2644d41891458d90cdd8a91a2df91a591b8474
parentd47088158c9e166b5ef986d9447ce54ee1bfd4dd (diff)
downloadaur-36ecef1d06eb733c3d14a4b5ddb615335206088e.tar.gz
Fixed typo
Diffstat
-rwxr-xr-xPKGBUILD3
1 files changed, 0 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3d0082d323a0..b2c44b1f12ac 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,10 @@ url="https://github.com/DestructiveReasoning/hasklock"
license=('BSD')
groups=()
depends=('ncurses')
-<<<<<<< Updated upstream
#makedepends=('git','haskell-text','haskell-hscurses')
makedepends=('git')
-=======
makedepends=('git' 'haskell-text' 'haskell-hscurses')
#makedepends=('git')
->>>>>>> Stashed changes
provides=('hasklock')
conflicts=()
replaces=()