Update SegmentationGUI.m

bug load segparam
neuropoly · Jan 12, 2017 · 5e254e1 · 5e254e1
1 parent 0314a2c
commit 5e254e1
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/code/GUI/SegmentationGUI.m b/code/GUI/SegmentationGUI.m
@@ -1541,8 +1541,6 @@ function text20_ButtonDownFcn(hObject, eventdata, handles)
 
 % 
 % 
-% <<<<<<< HEAD
-% =======
 % --- Executes on button press in LoadSegParam.
 function LoadSegParam_Callback(hObject, eventdata, handles)
 % hObject    handle to LoadSegParam (see GCBO)
@@ -1594,7 +1592,6 @@ function LoadSegParam_Callback(hObject, eventdata, handles)
 end
 % Update handles
 guidata(hObject,handles);
-% >>>>>>> b9397d0ebc725f27a00cabafb1f722c7fb566f8e
 
 
 % % --- Executes on button press in LevelSetSeg.