From 301c14b991549dc1fb2a3bc995b16b6af91e4471 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Mon, 25 Mar 2013 19:44:31 +0400
Subject: [PATCH] fixed gitreview

Change-Id: I33836c8794c02ead3678abe8da276a6ee993c94e
---
 .gitreview | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitreview b/.gitreview
index a5e3905..e9b1f37 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,8 +2,4 @@
 host=gerrit.mirantis.com
 project=openstack/horizon.git
 defaultremote=gerrit-mirantis
-<<<<<<< HEAD
 defaultbranch=openstack-ci/build/grizzly
-=======
-defaultbranch=openstack-ci/fuel/grizzly
->>>>>>> ef69a16... Initial commit.
-- 
2.45.2