We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
2 parents 8d8a492 + 31ea33e commit 17fd3e1Copy full SHA for 17fd3e1
src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
@@ -41,10 +41,14 @@
41
<td class="col md-col">{{ entry.customer_name }}</td>
42
<td class="hidden-col">{{ entry.customer_id }}</td>
43
<td class="col md-col">{{ entry.activity_name }}</td>
44
+<<<<<<< HEAD
45
<td class="col lg-col">
46
<a (click)="isLinkExternal(entry.uri)"
47
[ngStyle]="{'cursor':'pointer'}">{{ entry.uri }}</a>
48
</td>
49
+=======
50
+ <td class="col lg-col"><a (click)="isLinkExternal(entry.uri)">{{ entry.uri }}</a></td>
51
+>>>>>>> 31ea33edd05f05bb7ea16bd1f0ac9fd857a362b8
52
<td class="col lg-col">{{ entry.description }}</td>
53
<td class="col lg-col">{{ entry.technologies }}</td>
54
</tr>
0 commit comments