https://bugs.launchpad.net/moonshot-ui/+bug/1447008

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

diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
index e227013..c2104d9 100644 (file)
--- a/moonshot-ui.spec.in
+++ b/moonshot-ui.spec.in
@@ -1,7 +1,6 @@
 Name:           @PACKAGE@
 Version:        @VERSION@
-<<<<<<< HEAD
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
 Group:          Security Tools