Browse Source

Fix patchpabel

Jan Behrens 1 year ago
parent
commit
ca3627602c
1 changed files with 0 additions and 4 deletions
  1. 0 4
      patchpanel/index.php

+ 0 - 4
patchpanel/index.php

@@ -284,11 +284,7 @@
 
 <font size="6">
 <a href="../index.php" title="Back to main page">
-<<<<<<< HEAD
 <img style="margin-right: .5em; margin-bottom: -8px" src="../pics/katrin_logo_round.png" width="40px" height="40px">
-=======
-<img style="margin-right: 1em; padding: 5px" src="../pics/katrin_logo_round.png" width="2em" height="2em">
->>>>>>> 8d26f27 (Patchpanel styling)
 <a>
 <b>High-Voltage Patch-Panel Configuration</b>
 </font>