1 files changed, 4 insertions(+), 14 deletions(-)

M sr.ht/paste.sr.ht/APKBUILD

@@ 38,16 38,13 @@ package() {
 		"$pkgdir"/etc/init.d/paste.sr.ht
 	install -Dm644 "$srcdir"/paste.sr.ht.confd \
 		"$pkgdir"/etc/conf.d/paste.sr.ht
-<<<<<<< HEAD
 	install -Dm755 "$srcdir"/paste.sr.ht-api.initd \
 		"$pkgdir"/etc/init.d/paste.sr.ht-api
 	install -Dm644 "$srcdir"/paste.sr.ht-api.confd \
 		"$pkgdir"/etc/conf.d/paste.sr.ht-api
 	install -Dm755 api/pastesrht-api "$pkgdir"/usr/bin/pastesrht-api
-=======
 	install -Dm644 "$srcdir"/paste.sr.ht.gunicorn.conf.py \
 		"$pkgdir"/etc/sr.ht/paste.sr.ht.gunicorn.conf.py
->>>>>>> *.sr.ht: Enable prometheus multiprocessing mode
 }
 
 _nginx() {


@@ 58,18 55,11 @@ _nginx() {
 }
 
 sha512sums="
-<<<<<<< HEAD
-7f138f10c863c17db26f9b625885351dbdc41e00da1d6f070fb8785aee23e4b63a0e2c9acc0054f86b583a05aad196f98c80845ae536debaf1cf6c4e2b2d15b4  paste.sr.ht-0.12.1.tar.gz
-0b2b6b2916799e20d05d6e35fdb20ac0cded65e254beb79a3aa91d4faa20fe6c93bd3e178acb2d2966841a7ce4f0149b0a863db1d57a36407ff85833779d3959  sr.ht-nginx-0.12.1.tar.gz
-ecbbfe19bbb60bb7724210bb38601dcf64cbd24056fb59d22ac4539082b6e30ac4d80b59d1e3ba58ac232df291304746b6deb49836c0a329233c3531baa33bda  paste.sr.ht.initd
-8b4f89e5d8fd96b6e898f81c7d5f516715285a4cb871a6bb31bcea059eb40aff5019039a973815aacd22eb9957bb02b2835a8e9c9aac3ab83649145c6636a388  paste.sr.ht.confd
+f52d1b53795920f922052b18614b4ca53288fc72041bc32818da0d9353fa45b164e59da85b9ee6159a3196521f8ced5bc3794d2f77d4e9d2c80b4325178b5a46  paste.sr.ht-0.13.6.tar.gz
+1b447f5c7f3aabd61afac0f41352d18a65fa9e27d7c3ddbb84730819da533ef815023a15f0ffb80fba13434ed10fd0171b06c7cf7388b353fb5cee17a2431158  sr.ht-nginx-0.13.6.tar.gz
+c6cf45c795f82493a2779c12d67af3ae934d171c4ec81e1a4d36c411b8ff7234bc6ba396a411781e9dfc861557a9223066b5342b5fa9908d1b1bf08f1a12466f  paste.sr.ht.initd
+dea54d754186f6bc67c8ca3ef6cc5236355cdc9962aa502d4138245bdcba7edb804b627fcfbf4909fc54bed08ef44ce635947982ff3cb69f3dac0bb6bd55abb3  paste.sr.ht.confd
 263f268ba32fef424d8b44af76fa9c94a309c75d2d8c40f46b6556c713c590744edb6e78810b3d9c7a1d037d314c12e034d5e2cee4b46c92851a5e65dfb4f3a3  paste.sr.ht-api.initd
 e226a1a3913749c5a72e57c2e6f75f94199f47c72d47ccbac5abba3bc30b827d8619c2f1a60ef2b67f28074007a051981f47d4d2c749da4c5e5e9d1823f54dbf  paste.sr.ht-api.confd
-=======
-0d9851d95e86bd9a32fcc437c12d34471575b6da861aff6666b6fe1246810d99b3c9bc898f4342eaaa31a7771dfe1e1d1c2cb75ffb14d2a23b0a9c2f8cf27d49  paste.sr.ht-0.12.4.tar.gz
-691524a85946dce41d81bbad585fc84c98308b21cec5373b1e0cf2009e3c8592e3563ad816fb2ef2f1befe88c568584a5af277a77ca56367a2dec8222bd589b8  sr.ht-nginx-0.12.4.tar.gz
-72febad34a908e3402ca5a914226e8757e294e5524452124bd219ea411ad97f3417a1ea40b0d706dac1468b2231aee1f7ca7a214f351178dda4ab54f7ef442dc  paste.sr.ht.initd
-dea54d754186f6bc67c8ca3ef6cc5236355cdc9962aa502d4138245bdcba7edb804b627fcfbf4909fc54bed08ef44ce635947982ff3cb69f3dac0bb6bd55abb3  paste.sr.ht.confd
 21f39ea0981d7773eb512e5ba234022364d0f7ee9b6ca897ce4c51e3b127eb2d9a7a5fbcaa06d14f20b2df2439421d7261f200e3f4f13b45a91e78ba77bc363c  paste.sr.ht.gunicorn.conf.py
->>>>>>> *.sr.ht: Enable prometheus multiprocessing mode
 "