fixing spacing and flake errors in tag prs

story645 · story645 · commit afda2909338a · 2024-09-13T14:24:05.000-04:00
diff --git a/galleries/examples/lines_bars_and_markers/multivariate_marker_plot.py b/galleries/examples/lines_bars_and_markers/multivariate_marker_plot.py
@@ -47,13 +47,9 @@
 plt.show()
 
 # %%
-<<<<<<< HEAD
 # .. tags::
 #
 #    component: marker
 #    styling: color
 #    level: beginner
 #    purpose: fun
-=======
-# .. tags:: styling: marker, purpose: fun
->>>>>>> 9577fb2f77 (tags for multivariate_marker_plot, geo_demo, and subplots_demo)
diff --git a/galleries/examples/subplots_axes_and_figures/subplots_demo.py b/galleries/examples/subplots_axes_and_figures/subplots_demo.py
@@ -211,14 +211,10 @@
 plt.show()
 
 # %%
-<<<<<<< HEAD
 # .. tags::
 #
 #    component: subplot
 #    plot-type: line
 #    plot-type: polar
 #    level: beginner
 #    purpose: showcase
-=======
-# .. tags:: component: axes, component: axis, component: subplot, plot-type: polar
->>>>>>> 9577fb2f77 (tags for multivariate_marker_plot, geo_demo, and subplots_demo)
diff --git a/galleries/examples/widgets/polygon_selector_simple.py b/galleries/examples/widgets/polygon_selector_simple.py
@@ -40,7 +40,7 @@
 # %%
 # .. tags::
 #
-#    component:axes, styling: position, plot-type: line, level: intermediate,
+#    component: axes, styling: position, plot-type: line, level: intermediate,
 #    domain: cartography, domain: geometry, domain: statistics,
 #    internal: high-bandwidth
 #

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`# %%`
`41`	`41`	`# .. tags::`
`42`	`42`	`#`
`43`		`-# component:axes, styling: position, plot-type: line, level: intermediate,`
	`43`	`+# component: axes, styling: position, plot-type: line, level: intermediate,`
`44`	`44`	`# domain: cartography, domain: geometry, domain: statistics,`
`45`	`45`	`# internal: high-bandwidth`
`46`	`46`	`#`