anchor.diff:      </div>
   
       <div class="information">
  -<<<<<<< HEAD
         <div class="briefing">
           <header>
             <div class="icontitle">
  
positive.code:             <!--titulo-->
              <h2><%= @category.title %></h2>
              <div class="description"><%= @category.description %></div>
              <div class="author"> <span class="by"><%=t('by')%></span> <%= link_to @category.author.name, @category.author.subject %></div>
            </div>
          </header>
  
negative.code:           </div>
          </div>
        </div>
  
      <% if can?(:update, @category) %>
        <div class="update" style="display:none">
          <%= form_for(@category, :url => [@category]) do |f| %>
  