resolved merge conflict

anilkpandey · anilkpandey · commit f0094914cb93 · 2019-07-19T16:47:53.000-07:00
diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -3106,7 +3106,7 @@ bool processFlexCounterEvent(
         if (!try_translate_vid_to_rid(vid, rid))
         { 
             SWSS_LOG_WARN("port VID %s, was not found (probably port was removed/splitted) and will remove from counters now",
-            sai_serialize_object_id(vid).c_str());
+              sai_serialize_object_id(vid).c_str());
             return false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -3106,7 +3106,7 @@ bool processFlexCounterEvent(`
`3106`	`3106`	`if (!try_translate_vid_to_rid(vid, rid))`
`3107`	`3107`	`{`
`3108`	`3108`	`SWSS_LOG_WARN("port VID %s, was not found (probably port was removed/splitted) and will remove from counters now",`
`3109`		`- sai_serialize_object_id(vid).c_str());`
	`3109`	`+ sai_serialize_object_id(vid).c_str());`
`3110`	`3110`	`return false;`
`3111`	`3111`	`}`
`3112`	`3112`	`}`