From d97b0a0f825e06b72af731fd304b11ff7798972c Mon Sep 17 00:00:00 2001
From: JBrackenhoff <J.A.Brackenhoff@tudelft.nl>
Date: Tue, 24 Oct 2017 13:15:10 +0200
Subject: [PATCH] Conflict
---
raytime/model.scr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/raytime/model.scr b/raytime/model.scr
index 74f471c..7d7419e 100755
--- a/raytime/model.scr
+++ b/raytime/model.scr
@@ -23,4 +23,4 @@ export OMP_NUM_THREADS=1
zrcv1=0 zrcv2=0 \
xsrc=0 zsrc=1100
-echo "test"
+echo "testblaas"
--
GitLab