1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-01-31 12:23:48 +01:00

Remove erroneous data and fix indentation

This commit is contained in:
kaernyk 2014-09-26 08:23:25 -04:00
parent 5093f5c121
commit 74ab0a2feb

View File

@ -535,20 +535,17 @@ pre {
background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34);
max-height:300px;
<<<<<<< HEAD
background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34);
=======
background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34);
>>>>>>> 5b5f3984f0d17a0dfaf6cdc7f49ec31fe5c862b8
background: rgba(182, 182, 182, 0.12);
border: 2px solid rgba(111, 111, 111, 0.34);
}
.theme-catalog div.thread strong {
display: block;
display: block;
}
.theme-catalog div.threads{
text-align: center;
margin-left: -20px;
text-align: center;
margin-left: -20px;
}
div.thread:hover {