Resolved merge conflicts

82b1fc88 · Roxane Kang Maréchal · aa1aacb0 · 82b1fc88
Commit 82b1fc88 authored Dec 22, 2019 by Roxane Kang Maréchal
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

.gitignore .gitignore +1 -4

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,5 @@ target/

 *.launch
 !analysis.launch
-<<<<<<< HEAD
-=======

-*.orig
->>>>>>> master
+*.orig
\ No newline at end of file