Commit 8c9dda0a authored by Roxane Kang Maréchal's avatar Roxane Kang Maréchal
Browse files

Resolved merge conficts

parent 165241d8
......@@ -55,4 +55,4 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
</launchConfiguration>
\ No newline at end of file
</launchConfiguration>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment