From 2c85b964e3be0f7ca3ff513b855f7bd26b936cc9 Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Mon, 5 Aug 2013 19:07:23 +0200
Subject: [PATCH] Cleanup

---
 registry/registry_mock_test.go | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/registry/registry_mock_test.go b/registry/registry_mock_test.go
index e39637c16c..e752315510 100644
--- a/registry/registry_mock_test.go
+++ b/registry/registry_mock_test.go
@@ -336,7 +336,6 @@ func TestPing(t *testing.T) {
 
 /* Uncomment this to test Mocked Registry locally with curl
  * WARNING: Don't push on the repos uncommented, it'll block the tests
-<<<<<<< HEAD
  *
 func TestWait(t *testing.T) {
 	log.Println("Test HTTP server ready and waiting:", testHttpServer.URL)
@@ -344,12 +343,4 @@ func TestWait(t *testing.T) {
 	<-c
 }
 
-//*/
-=======
- */
-// func TestWait(t *testing.T) {
-// 	log.Println("Test HTTP server ready and waiting:", testHttpServer.URL)
-// 	c := make(chan int)
-// 	<-c
-// }
->>>>>>> Mock registry: Fixed a bug where the index validation path would return a 200 status code instead of the expected 204
+//*/
\ No newline at end of file