Fix badly resolved conflict

a849cff1 · sajolida · ce17f8b0 · a849cff1
Commit a849cff1 authored Jan 24, 2016 by sajolida
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

wiki/src/install/inc/stylesheets/dave.css wiki/src/install/inc/stylesheets/dave.css +0 -3

No files found.
--- a/wiki/src/install/inc/stylesheets/dave.css
+++ b/wiki/src/install/inc/stylesheets/dave.css
@@ -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