fix merge conflict

[moonshot-ui.git] / moonshot-ui.spec.in

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