From bc24f38266685258512be8df91c498329f328cc0 Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Fri, 12 Apr 2024 23:05:19 +0000 Subject: [PATCH] upgpkg: 0.15.0-1 --- .SRCINFO | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0da61e8..5b94533 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,6 @@ pkgbase = gotosocial pkgdesc = ActivityPub social network server written in Golang -<<<<<<< HEAD - pkgver = 0.14.2 -||||||| parent of 6bb58b8 (upgpkg: 0.15.0-1) - pkgver = 0.12.2 -======= pkgver = 0.15.0 ->>>>>>> 6bb58b8 (upgpkg: 0.15.0-1) pkgrel = 1 url = https://gotosocial.org arch = x86_64 @@ -41,13 +35,7 @@ pkgbase = gotosocial backup = etc/gotosocial/template/status.tmpl backup = etc/gotosocial/template/tag.tmpl backup = etc/gotosocial/template/thread.tmpl -<<<<<<< HEAD - source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#commit=0bd95d7b71ae71d801b0fbb643598eb0ccd1b8f5 -||||||| parent of 6bb58b8 (upgpkg: 0.15.0-1) - source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#commit=096c517cc332ce2832a8c5dfbd1cd827ab7d0ecb -======= source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#tag=v0.15.0 ->>>>>>> 6bb58b8 (upgpkg: 0.15.0-1) source = sysusers.conf source = tmpfiles.conf source = use-fhs-directories.patch