public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/atril] epel8: fix spec file
@ 2026-06-11 19:46 raveit65
  0 siblings, 0 replies; only message in thread
From: raveit65 @ 2026-06-11 19:46 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/atril
Branch : epel8
Commit : cc2e302968f912852786356c098af1e00543135c
Author : raveit65 <mate@raveit.de>
Date   : 2024-01-24T14:21:56+01:00
Stats  : +0/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/atril/c/cc2e302968f912852786356c098af1e00543135c?branch=epel8

Log:
fix spec file

---
diff --git a/atril.spec b/atril.spec
index 80c8fe4..58a9b8e 100644
--- a/atril.spec
+++ b/atril.spec
@@ -29,11 +29,8 @@ URL:           http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
-<<<<<<< HEAD
-=======
 BuildRequires: cairo-gobject-devel
 BuildRequires: desktop-file-utils
->>>>>>> 99cdfe7 (update to 1.26.2)
 BuildRequires: gcc-c++
 BuildRequires: gobject-introspection-devel
 BuildRequires: gtk3-devel

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-11 19:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-11 19:46 [rpms/atril] epel8: fix spec file raveit65

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox