Remove merge conflict marker

Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Jun 14, 2024 · e249b8e · e249b8e
1 parent ed8f171
commit e249b8e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -256,7 +256,6 @@
     * [Pull request #2237](https://github.com/gazebosim/gz-sim/pull/2237)
     * [Pull request #2222](https://github.com/gazebosim/gz-sim/pull/2222)
 
->>>>>>> gz-sim8
 ### Gazebo Sim 8.0.0 (2023-09-29)
 
 1. TouchPlugin: Reset the plugin with the initial values