projects
/
moonshot-ui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f8c3b55
)
fix merge conflict
author
Sam Hartman
<hartmans@debian.org>
Mon, 23 Jun 2014 16:08:46 +0000
(12:08 -0400)
committer
Sam Hartman
<hartmans@debian.org>
Mon, 23 Jun 2014 16:09:26 +0000
(12:09 -0400)
moonshot-ui.spec.in
patch
|
blob
|
history
diff --git
a/moonshot-ui.spec.in
b/moonshot-ui.spec.in
index
e227013
..
7d0a243
100644
(file)
--- a/
moonshot-ui.spec.in
+++ b/
moonshot-ui.spec.in
@@
-1,6
+1,5
@@
Name: @PACKAGE@
Version: @VERSION@
-<<<<<<< HEAD
Release: 1%{?dist}
Summary: Moonshot Federated Identity User Interface