Skip to content

CIRCLE / cloud

Go to a project
Commit 8cb0c931 by Őry Máté
Options

webui: remove conflict mark left in 33c6219a :(

parent c4b1f23b
Showing with 0 additions and 1 deletions
one/templates/home.html
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
<div class="details"> <div class="details">
<div class="details-container"> <div class="details-container">
<ul> <ul>
<<<<<<< Updated upstream
<li class="os-{{s.template.os_type}}"> <li class="os-{{s.template.os_type}}">
{% trans "System" %}: {% trans "System" %}:
<span class="value">{{s.template.system}}</span> <span class="value">{{s.template.system}}</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment