Merge pull request #8 from hydrocoast/fix

Delete leftover conflict messages

Author: povilaskarvelis

daviolinplot/daviolinplot.m

@@ -182,11 +182,8 @@
 addParameter(p, 'colors', get(gca,'colororder'));
 addParameter(p, 'violinalpha', 1);
 addParameter(p, 'violinwidth', 1);
-<<<<<<< HEAD
 addParameter(p, 'violinmin',[]);
 addParameter(p, 'violinmax',[]);
-=======
->>>>>>> 87178648104a9d2e1b75fee13c302ddb3d365bee
 addParameter(p, 'smoothing','default');
 addParameter(p, 'box', 2);
 addParameter(p, 'boxcolors', 'k'); 
@@ -560,4 +557,4 @@
 xlim([gpos(1)-3*box_width, gpos(end)+3*box_width]); % adjust x-axis margins
 
 
-end
+end