lion187
/
TaskFlow
forked from OrgGo/Tasks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

file left to merge

This commit is contained in:
Suraj 2016-01-28 21:43:17 +05:30
parent c585103642
commit 0a3231d369
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/templates/home.html
View File

@ -52,11 +52,8 @@
<li role="presentation"> <li role="presentation">
<span class="glyphicon glyphicon-time"></span> {{.Created}}</li> <span class="glyphicon glyphicon-time"></span> {{.Created}}</li>
<li role="presentation"> <li role="presentation">
<<<<<<< HEAD
<a role="menuitem" tabindex="-1" href="/mask/{{.Id}}"> <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
=======
<a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
>>>>>>> 474ffbc0ea29e8ccacc707893a07534a4afed961
<span class="glyphicon glyphicon-lock"></span></a></li> <span class="glyphicon glyphicon-lock"></span></a></li>
<li role="presentation"> <li role="presentation">
<a role="menuitem" tabindex="-1" href="/trash/{{.Id}}"> <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">