Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8cb0c931
authored
Feb 13, 2013
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
webui: remove conflict mark left in
33c6219a
:(
parent
c4b1f23b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletions
+0
-1
one/templates/home.html
+0
-1
No files found.
one/templates/home.html
View file @
8cb0c931
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment