Code Review / openstack-build / horizon-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: dc71b21)
fixed gitreview
authorMatthew Mosesohn <mmosesohn@mirantis.com>
Mon, 25 Mar 2013 15:44:31 +0000 (19:44 +0400)
committerMatthew Mosesohn <mmosesohn@mirantis.com>
Mon, 25 Mar 2013 15:44:31 +0000 (19:44 +0400)
Change-Id: I33836c8794c02ead3678abe8da276a6ee993c94e

.gitreview patch | blob | history

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