From ea9e814dc5d1c142d006f60c575a0261f247e2b8 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Mon, 19 May 2014 21:23:14 -0400
Subject: [PATCH] Update version

---
 configure.ac        | 2 +-
 moonshot-ui.spec.in | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 92f76c3..020dc9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([Moonshot-ui],
-        [0.6],
+        [0.7],
         [moonshot-community@jiscmail.ac.uk],
         [moonshot-ui],
         [http://www.project-moonshot.org/])
diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
index 994aa70..e227013 100644
--- a/moonshot-ui.spec.in
+++ b/moonshot-ui.spec.in
@@ -1,6 +1,7 @@
 Name:           @PACKAGE@
 Version:        @VERSION@
-Release:        8%{?dist}
+<<<<<<< HEAD
+Release:        1%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
 Group:          Security Tools
-- 
2.1.4