From 4dcfce6b1be1b1237c2be9d7dcbf2ac8a11ead81 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 6 Jun 2017 13:40:05 +0000
Subject: [PATCH] adda comment

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7475 d63d8f72-b253-0410-a779-e742ad2e26cf
---
 crpptbx/TCV/gdat_tcv.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index b6559aa7..ff2e7d3a 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1522,6 +1522,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         DS = take_all_signals(shot); %Read from mds
         SDS_DS = define_simulink_signals(DS); %Put them in predifined structure
         % Add the .data and .t structure
+        % there was a conflict with r 7471
         for ii=1:numel(SDS_DS) %iter over node 
           node = ii;
           for jj=1:numel(SDS_DS{ii}) %iter over threads
-- 
GitLab