Initial commit.

Change-Id: Ib0ac9e597f1192bc9a5502918e079ddc90f0e802

Conflicts:
	.gitreview

diff --git a/.gitreview b/.gitreview
index e9b1f37f7b4dc31b735ad1f0e665fd8a75126f68..a5e3905ffcb42ed151a59066e772e2e059179d67 100644 (file)
--- 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.