[mlir][emitc][NFC] Resolve the merge conflicts

Author: EtoAndruwa

mlir/include/mlir/Dialect/EmitC/IR/EmitC.td

@@ -1271,15 +1271,14 @@ def EmitC_VerbatimOp : EmitC_Op<"verbatim"> {
     #endif
     ```
 
-<<<<<<< HEAD
     If the `emitc.verbatim` op has operands, then the `value` is interpreted as
     format string, where `{}` is a placeholder for an operand in their order.
     For example, `emitc.verbatim "#pragma my src={} dst={}" %src, %dest : i32, i32`
     would be emitted as `#pragma my src=a dst=b` if `%src` became `a` and
     `%dest` became `b` in the C code.
     `{{` in the format string is interpreted as a single `{` and doesn't introduce
     a placeholder.
-=======
+
     Example:
 
     ```mlir
@@ -1291,7 +1290,6 @@ def EmitC_VerbatimOp : EmitC_Op<"verbatim"> {
     typedef float f32;
     #pragma my var=v1 property
     ```
->>>>>>> cabdac5e5703 ([mlir][emitc][NFC] Add an example to the description of the emitc.verbatim operation)
   }];
 
   let extraClassDeclaration = [{