webui: remove conflict mark left in 33c6219a :(

8cb0c931 · Őry Máté · c4b1f23b · 8cb0c931
Commit 8cb0c931 authored Feb 13, 2013 by Őry Máté
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

one/templates/home.html
+0 -1

No files found.
--- a/one/templates/home.html
+++ b/one/templates/home.html
@@ -37,7 +37,6 @@
                            <div class="details">
                                <div class="details-container">
                                    <ul>
-<<<<<<< Updated upstream
                                        <li class="os-{{s.template.os_type}}">
                                            {% trans "System" %}:
                                            <span class="value">{{s.template.system}}</span>