cleaned up rouge merge lines

tacaswell · tacaswell · commit 40c4fe71796e · 2014-06-26T21:05:01.000-04:00
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -186,7 +186,6 @@ Code removal
   ``scipy.stats.levy`` should be used instead
 
 
->>>>>>> BUG/API : tweaked how AnchoredSizeBar handles font properties
 .. _changes_in_1_3:
 
 

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,6 @@ Code removal`
`186`	`186`	``scipy.stats.levy`` should be used instead
`187`	`187`
`188`	`188`
`189`		`->>>>>>> BUG/API : tweaked how AnchoredSizeBar handles font properties`
`190`	`189`	`.. _changes_in_1_3:`
`191`	`190`
`192`	`191`