diff options
| author | fwhcat | 2019-05-02 23:22:22 +0200 |
|---|---|---|
| committer | fwhcat | 2019-05-02 23:22:22 +0200 |
| commit | 9010828cde4a4992e308f4788267609b7ed28bfa (patch) | |
| tree | e32ff1527869009b15ff1a2fbfa5bbb1d699a563 | |
| parent | d2472873a1071d4aac6293c42fd5d9dc06542713 (diff) | |
| parent | 3bf6bf84ccf3d8d29e3724514101c3fe9f9a24fe (diff) | |
| download | aur-9010828cde4a4992e308f4788267609b7ed28bfa.tar.gz | |
Oops conflicts & provides using -git package
| -rw-r--r-- | PKGBUILD | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -11,8 +11,13 @@ license=('GPL3') makedepends=('git') +<<<<<<< HEAD provides=("${_pkgname}-git") conflicts=("${_pkgname}-git") +======= +provides=("${pkgname}") +conflicts=("${pkgname}") +>>>>>>> 3bf6bf84ccf3d8d29e3724514101c3fe9f9a24fe source=("${_pkgname}::git+https://github.com/B00merang-Artwork/Windows-10.git") sha256sums=('SKIP') |