From dc71b21e7ae848ac8180c7515e648d6dd41be5f6 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Mon, 25 Mar 2013 19:44:18 +0400
Subject: [PATCH] Initial commit.

Change-Id: Ib0ac9e597f1192bc9a5502918e079ddc90f0e802

Conflicts:
	.gitreview
---
 .gitreview | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitreview b/.gitreview
index e9b1f37..a5e3905 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,8 @@
 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