projects / moonshot-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f8c3b55)
fix merge conflict
authorSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:08:46 +0000 (12:08 -0400)
committerSam 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@
 Name:           @PACKAGE@
 Version:        @VERSION@
-<<<<<<< HEAD
 Release:        1%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
 Release:        1%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
Moonshot User Interface