Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
a849cff1
Commit
a849cff1
authored
Jan 24, 2016
by
sajolida
Browse files
Fix badly resolved conflict
parent
ce17f8b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
wiki/src/install/inc/stylesheets/dave.css
View file @
a849cff1
...
...
@@ -333,7 +333,6 @@ html[data-phase="ready"] #bittorrent-minor {
.extension
code
{
font-size
:
80%
;
}
<<<<<<<
HEAD
/* Steps numbers */
...
...
@@ -446,5 +445,3 @@ html:not([data-phase="verified"]) #downloaded-path {
#download
[
data-state
=
"failed"
]
#download-message-failed
{
display
:
none
!important
;
}
=======
>>>>>>>
origin
/
web
/
10643
-responsive
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment