Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Conflicts:
	EmpleoDotNet/Views/JobOpportunity/Detail.cshtml
	EmpleoDotNet/Views/Shared/_JobListPartial.cshtml
  • Loading branch information
eatskolnikov committed Sep 8, 2016
2 parents 3ed70da + b48f6c5 commit 3fd1662
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
5 changes: 0 additions & 5 deletions EmpleoDotNet/Views/JobOpportunity/Detail.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@
<i class="fa fa-lg fa-thumbs-o-up"></i>
<span>@Model.Likes.FormatThousand()</span>
</a>
&nbsp;
<a href="#" class="like-job dislike @disabledClass" title="No me gusta" data-job="@Model.Id" data-like="false" data-canlike="@ViewBag.CanLike.ToString().ToLower()">
<i class="fa fa-lg fa-thumbs-o-down"></i>
<span>@Model.DisLikes.FormatThousand()</span>
</a>
</div>
</div>
<div class="sidebar-widget" id="share">
Expand Down
5 changes: 0 additions & 5 deletions EmpleoDotNet/Views/Shared/_JobListPartial.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@
<i class="fa fa-lg fa-thumbs-o-up"></i>
@(jobOpportunity.Likes.FormatThousand())
</span>
&nbsp;
<span class="text-danger">
<i class="fa fa-lg fa-thumbs-o-down"></i>
@(jobOpportunity.DisLikes.FormatThousand())
</span>
</p>
</div>
</div>
Expand Down

0 comments on commit 3fd1662

Please sign in to comment.