[#1235] Fixed spelling errors

modified:   cfg_duid_unittest.cc

diff --git a/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc b/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
index e862ab7f403411268473ff81d282e5b269485e7f..10da5b9b4fd88f61b442fca4774aea96d2190957 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
@@ -220,11 +220,7 @@ TEST_F(CfgDUIDTest, createEN) {
     // Verify that the DUID file has been created.
     EXPECT_TRUE(fileExists(absolutePath(DUID_FILE_NAME)));
 
-<<<<<<< HEAD
     // Verify getCurrentDuid() returns the value created.
-=======
-    // Verifiy getCurrentDuid() returns the value created.
->>>>>>> [#1235] Updated v6 option defintions, made current server_id accessible
     DuidPtr current_duid = cfg.getCurrentDuid();
     ASSERT_TRUE(current_duid);
     EXPECT_EQ(*current_duid, *duid);
@@ -249,11 +245,7 @@ TEST_F(CfgDUIDTest, createLL) {
     // Verify that the DUID file has been created.
     EXPECT_TRUE(fileExists(absolutePath(DUID_FILE_NAME)));
 
-<<<<<<< HEAD
     // Verify getCurrentDuid() returns the value created.
-=======
-    // Verifiy getCurrentDuid() returns the value created.
->>>>>>> [#1235] Updated v6 option defintions, made current server_id accessible
     DuidPtr current_duid = cfg.getCurrentDuid();
     ASSERT_TRUE(current_duid);
     EXPECT_EQ(*current_duid, *duid);
@@ -279,11 +271,7 @@ TEST_F(CfgDUIDTest, createDisableWrite) {
     // DUID persistence is disabled so there should be no DUID file.
     EXPECT_FALSE(fileExists(absolutePath(DUID_FILE_NAME)));
 
-<<<<<<< HEAD
     // Verify getCurrentDuid() returns the value created.
-=======
-    // Verifiy getCurrentDuid() returns the value created.
->>>>>>> [#1235] Updated v6 option defintions, made current server_id accessible
     DuidPtr current_duid = cfg.getCurrentDuid();
     ASSERT_TRUE(current_duid);
     EXPECT_EQ(*current_duid, *duid);