summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/ffmpeg/APKBUILD7
1 files changed, 0 insertions, 7 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index cde37f8048..ed8ede8fb2 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -71,13 +71,6 @@ libs() {
md5sums="f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2
2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch"
-<<<<<<< HEAD
-sha256sums="dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce ffmpeg-1.1.2.tar.bz2
-0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch"
-sha512sums="b947d18c7ea7d371e772c97873b180c00b94025a8546eb4663e42f37fbf66d52b1ea8241219b6c4700bd8c12cfb6af12fb7d823f7632061c447e2d95e30f83aa ffmpeg-1.1.2.tar.bz2
-=======
sha256sums="a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 ffmpeg-1.1.3.tar.bz2
0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch"
sha512sums="56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 ffmpeg-1.1.3.tar.bz2
->>>>>>> 7e618390d4ba971927b8052fd4c5e22796e2ce4a
-635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch"