X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=moonshot-ui.spec.in;h=c2104d9a963f94d120d34438237ea61a7b7aa50c;hb=refs%2Fheads%2Fmaster;hp=e227013612c070679c64b72101ef2a3c7e50768b;hpb=ea9e814dc5d1c142d006f60c575a0261f247e2b8;p=moonshot-ui.git

diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
index e227013..c2104d9 100644
--- 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