Skip to content
Snippets Groups Projects
Commit ab68a0d6 authored by Dominique Marcadet's avatar Dominique Marcadet
Browse files

resolve conflict

parents 4034449b 3090ab92
No related branches found
No related tags found
1 merge request!8Resolve "add needed stuff to allow for loading NSD files with RiseClipseEditor"
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment