Update SegmentationGUI.m

Aldo Zaimi · web-flow · commit 5e254e11e500 · 2017-01-12T17:11:22.000-05:00
bug load segparam
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.

Original file line number	Diff line number	Diff line change
`@@ -1541,8 +1541,6 @@ function text20_ButtonDownFcn(hObject, eventdata, handles)`
`1541`	`1541`
`1542`	`1542`	`%`
`1543`	`1543`	`%`
`1544`		`-% <<<<<<< HEAD`
`1545`		`-% =======`
`1546`	`1544`	`% --- Executes on button press in LoadSegParam.`
`1547`	`1545`	`function LoadSegParam_Callback(hObject, eventdata, handles)`
`1548`	`1546`	`% hObject handle to LoadSegParam (see GCBO)`
`@@ -1594,7 +1592,6 @@ function LoadSegParam_Callback(hObject, eventdata, handles)`
`1594`	`1592`	`end`
`1595`	`1593`	`% Update handles`
`1596`	`1594`	`guidata(hObject,handles);`
`1597`		`-% >>>>>>> b9397d0ebc725f27a00cabafb1f722c7fb566f8e`
`1598`	`1595`
`1599`	`1596`
`1600`	`1597`	`% % --- Executes on button press in LevelSetSeg.`