Skip to content
Snippets Groups Projects
Commit aa73f7a3 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

- allow to merge file directly from onelab 

- better handling of new-style view merge
parent 53668c7c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 5 deletions
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