From 28aaead447fce8a686cb428718bcb40bff25ac17 Mon Sep 17 00:00:00 2001
From: Igor Peshansky <igorpeshansky@github.com>
Date: Tue, 3 Apr 2018 22:32:10 -0400
Subject: [PATCH] Fix merge conflict in kubernetes_unittest.

---
 test/kubernetes_unittest.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/kubernetes_unittest.cc b/test/kubernetes_unittest.cc
index 2841f947..6612123c 100644
--- a/test/kubernetes_unittest.cc
+++ b/test/kubernetes_unittest.cc
@@ -258,6 +258,7 @@ TEST_F(KubernetesTest, GetLegacyResource) {
     {"zone", "TestZone"},
   }), m.resource());
   EXPECT_TRUE(m.metadata().ignore);
+}
 
 TEST_F(KubernetesTest, GetClusterMetadataEmpty) {
   Configuration config(std::istringstream(