Skip to content

Commit 7ec7bef

Browse files
committed
FIX
1 parent cdcef81 commit 7ec7bef

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

mpl_sphinx_theme/static/css/style.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ html[data-theme="light"] {
99
}
1010

1111
html[data-theme="dark"] {
12-
<<<<<<< HEAD
13-
=======
1412
--pst-color-primary: #1f77b4;
15-
>>>>>>> d3e324f (ENH: add dark theme switcher)
1613
--pst-color-text-base: rgb(240, 240, 240);
1714
}
1815

0 commit comments

Comments
 (0)