almet/argos
1
0
Fork 0
mirror of https://framagit.org/framasoft/framaspace/argos.git synced 2025-04-28 18:02:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🩹 — Remove merge leftover

Browse source
This commit is contained in:
Luc Didry 2024-02-28 17:47:24 +01:00
parent be647a80b2
commit 49f64b0054
No known key found for this signature in database
GPG key ID: EA868E12D0257E3C
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
argos/server/templates/index.html
View file

@ -2,7 +2,6 @@
{% block title %}<h2>Dashboard</h2>{% endblock title %} {% block title %}<h2>Dashboard</h2>{% endblock title %}
{% block content %} {% block content %}
<div id="domains" class="frame"> <div id="domains" class="frame">
<<<<<<< HEAD
<nav> <nav>
<ul> <ul>
<li> <li>