diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-06-13 16:51:48 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-06-13 16:51:59 -0300 |
| commit | edc438a8a946765d8961b8fcca18b2cd27cc7920 (patch) | |
| tree | 731839782e4f8bf87eee470881c156e6d2aa68f2 /testing/agg | |
| parent | 3a50ba6f882e8f52e6d574a41357e9a20214be8f (diff) | |
| download | aports-edc438a8a946765d8961b8fcca18b2cd27cc7920.tar.bz2 aports-edc438a8a946765d8961b8fcca18b2cd27cc7920.tar.xz | |
testing/agg: remove conflict marker
Diffstat (limited to 'testing/agg')
| -rw-r--r-- | testing/agg/APKBUILD | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/testing/agg/APKBUILD b/testing/agg/APKBUILD index f596d5caf4..5d8ac2b8cf 100644 --- a/testing/agg/APKBUILD +++ b/testing/agg/APKBUILD @@ -7,7 +7,6 @@ pkgdesc="Anti-Grain Geometry (AGG) is a general purpose graphical toolkit writte options="!check" # No testsuite url="https://src.fedoraproject.org/rpms/agg" arch="all" ->>>>>>> testing/agg: fix build, import patches from Arch Linux license="GPL-2.0-or-later" options="!check" makedepends="autoconf automake libtool sdl-dev freetype-dev" |