Skip to content
Snippets Groups Projects
Commit d97b0a0f authored by Joeri Brackenhoff's avatar Joeri Brackenhoff
Browse files

Conflict

parent 427389e1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
raytime/model.scr
+ 1
− 1
View file @ d97b0a0f
......@@ -23,4 +23,4 @@ export OMP_NUM_THREADS=1
zrcv1=0 zrcv2=0 \
xsrc=0 zsrc=1100
echo "test"
echo "testblaas"
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