kubo pushed to asciinema (f22). "Misconfiguration in spec file"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 16:24:05 UTC 2015
>From fa27c2e0c622bbcf33c2e0f9a74251b6b964d57e Mon Sep 17 00:00:00 2001
From: Jakub Jedelsky <jakub.jedelsky at gmail.com>
Date: Fri, 6 Mar 2015 23:27:20 +0100
Subject: Misconfiguration in spec file
diff --git a/asciinema.spec b/asciinema.spec
index 29e6b40..53677b0 100644
--- a/asciinema.spec
+++ b/asciinema.spec
@@ -3,13 +3,6 @@
%global provider_tld com
%global pkgname asciinema
%global project %{pkgname}-cli
-
-<<<<<<< HEAD
-Name: asciinema
-Version: 0.9.8
-Release: 2%{?dist}
-Summary: Command line recorder for asciinema.org service
-=======
%global import_path %{provider}.%{provider_tld}/%{pkgname}/%{project}
%global commit b68b7e6333e971fc1960c647b4ccfb451ca7f39c
@@ -20,8 +13,6 @@ Name: %{pkgname}
Version: 0.9.9
Release: 1%{?dist}
Summary: Command line client (terminal recorder) for asciinema.org service
->>>>>>> Update to new version
-
Group: Applications/Internet
License: GPLv3
URL: http://asciinema.org
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/asciinema.git/commit/?h=f22&id=fa27c2e0c622bbcf33c2e0f9a74251b6b964d57e
More information about the scm-commits
mailing list