summaryrefslogtreecommitdiff
path: root/docs/_static/haiku.css
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:31:45 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:31:45 -0800
commit79b71228c1659f4127f4c151859f8a8c22838147 (patch)
tree0a9caa7ff32a45a3d83b4a5463659e7bc00435b7 /docs/_static/haiku.css
parent738ec92b8ea6175f20d81e356e5dc76bff1559c4 (diff)
downloadslixmpp-79b71228c1659f4127f4c151859f8a8c22838147.tar.gz
slixmpp-79b71228c1659f4127f4c151859f8a8c22838147.tar.bz2
slixmpp-79b71228c1659f4127f4c151859f8a8c22838147.tar.xz
slixmpp-79b71228c1659f4127f4c151859f8a8c22838147.zip
Fix some more merge conflicts.
Diffstat (limited to 'docs/_static/haiku.css')
-rw-r--r--docs/_static/haiku.css1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/_static/haiku.css b/docs/_static/haiku.css
index 41e0eb45..3d8ee6a7 100644
--- a/docs/_static/haiku.css
+++ b/docs/_static/haiku.css
@@ -409,7 +409,6 @@ div.viewcode-block:target {
padding: 0 12px;
}
-
#from_andyet {
-webkit-box-shadow: #CCC 0px 0px 3px;
background: rgba(255, 255, 255, 1);