anchor.diff:  -->
   
   <style>
  -#${n}portletBrowser .dataTables_filter, #${n}portletBrowser .first.paginate_button, #${n}portletBrowser .last.paginate_button{
  -    display: none;
  -}
  -#${n}portletBrowser .dataTables-inline, #${n}portletBrowser .column-filter-widgets {
  -    display: inline-block;
  -}
  -#${n}portletBrowser .dataTables_wrapper {
  -    width: 100%;
  -}
  -#${n}portletBrowser .dataTables_paginate .paginate_button {
  -    margin: 2px;
  -    color: #428BCA;
  -    cursor: pointer;
  -    *cursor: hand;
  -}
  -#${n}portletBrowser .dataTables_paginate .paginate_active {
  -    margin: 2px;
  -    color:#000;
  -}
  -
  -#${n}portletBrowser .dataTables_paginate .paginate_active:hover {
  -    text-decoration: line-through;
  -}
  -
  -#${n}portletBrowser table tr td a {
  -    color: #428BCA;
  -}
  -
  -#${n}portletBrowser .dataTables-left {
  -    float:left;
  -}
  -
  -#${n}portletBrowser .column-filter-widget {
  -    vertical-align: top;
  -    display: inline-block;
  -    overflow: hidden;
  -    margin-right: 5px;
  -}
  -
  -#${n}portletBrowser .filter-term {
  -    display: block;
  -    text-align:bottom;
  -}
  -
  -#${n}portletBrowser .dataTables_length label {
  -    font-weight: normal;
  -}
  -#${n}portletBrowser .datatable-search-view {
  -    text-align:right;
  -}
  +    #${n}portletBrowser .dataTables_filter, #${n}portletBrowser .first.paginate_button, #${n}portletBrowser .last.paginate_button{
  +        display: none;
  +    }
  +
  +    #${n}portletBrowser .dataTables-inline, #${n}portletBrowser .column-filter-widgets {
  +        display: inline-block;
  +    }
  +
  +    #${n}portletBrowser .dataTables_wrapper {
  +        width: 100%;
  +    }
  +
  +    #${n}portletBrowser .pagination {
  +        margin: 0;
  +    }
  +
  +    #${n}portletBrowser .dataTables_info, #${n}portletBrowser .dataTables_length {
  +        margin-top: 7px;
  +    }
  +
  +    #${n}portletBrowser .dataTables_paginate .paginate_button {
  +        margin: 2px;
  +        color: #428bca;
  +        cursor: pointer;
  +        *cursor: hand;
  +    }
  +    #${n}portletBrowser .dataTables_paginate .paginate_active {
  +        margin: 2px;
  +        color: #000;
  +    }
  +
  +    #${n}portletBrowser .dataTables_paginate .paginate_active:hover {
  +        text-decoration: line-through;
  +    }
  +
  +    #${n}portletBrowser table tr td a {
  +        color: #428bca;
  +    }
  +
  +    #${n}portletBrowser .dataTables-left {
  +        float: left;
  +    }
  +
  +    #${n}portletBrowser .dataTables-right {
  +        float: right;
  +    }
  +
  +    #${n}portletBrowser .column-filter-widget {
  +        display: inline;
  +        margin-right: 10px;
  +    }
  +
  +    #${n}portletBrowser .column-filter-widget select {
  +        width: 150px;
  +    }
  +
  +    #${n}portletBrowser .filter-term {
  +        display: block;
  +        text-align: bottom;
  +    }
  +
  +    #${n}portletBrowser .dataTables_length label {
  +        font-weight: normal;
  +    }
  +    #${n}portletBrowser .datatable-search-view {
  +        text-align: right;
  +    }
   </style>
   
   <!-- Portlet -->
   <div id="${n}portletBrowser" class="fl-widget portlet ptl-mgr view-home" role="section">
  +<<<<<<< Updated upstream
   
     <c:if test="${not empty statusMsgCode}">
         <div class="alert alert-success alert-dismissable">
  
positive.code:     specific language governing permissions and limitations
      under the License.
  
  --%>
  
  <%@ include file="/WEB-INF/jsp/include.jsp" %>
  
  <!-- START: VALUES BEING PASSED FROM BACKEND -->
  <portlet:actionURL var="queryUrl">
    <portlet:param name="execution" value="${flowExecutionKey}" />
  </portlet:actionURL>
  
  <c:set var="n"><portlet:namespace/></c:set>
  
  <portlet:actionURL var="newPortletUrl" >
    <portlet:param name="execution" value="${flowExecutionKey}" />
    <portlet:param name="_eventId" value="createPortlet"/>
  </portlet:actionURL>
  <portlet:actionURL var="editPortletUrl" escapeXml="false">
    <portlet:param name="execution" value="${flowExecutionKey}" />
    <portlet:param name="_eventId" value="editPortlet"/>
    <portlet:param name="portletId" value="PORTLETID"/>
  </portlet:actionURL>
  <portlet:actionURL var="removePortletUrl" escapeXml="false">
    <portlet:param name="execution" value="${flowExecutionKey}" />
    <portlet:param name="_eventId" value="removePortlet"/>
    <portlet:param name="portletId" value="PORTLETID"/>
  </portlet:actionURL>
  <!-- END: VALUES BEING PASSED FROM BACKEND -->
  
  
negative.code:             <input type="text" class="portlet-search-input"/>
          </form>
        </div>
  =======
      <c:if test="${not empty statusMsgCode}">
          <div class="alert alert-success alert-dismissable">
              <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
              <spring:message code="${statusMsgCode}" arguments="${portlet.name}" htmlEscape="true"/>
              <c:if test="${not empty layoutURL}">
                  <spring:message code="add.portlet.to.layout" arguments="${layoutURL}" htmlEscape="false"/>
              </c:if>
          </div>
      </c:if>
      <!-- Portlet Titlebar -->
      <div class="fl-widget-titlebar titlebar portlet-titlebar" role="sectionhead">
          <h2 class="title" role="heading"><spring:message code="portlet.registry"/></h2>
          <div class="fl-col-flex2 toolbar" role="toolbar">
              <div class="fl-col">
                  <ul class="btn-group">
                      <li class="btn"><a class="btn btn-primary button" href="${ newPortletUrl }" title="<spring:message code="register.new.portlet"/>"><span><spring:message code="register.new.portlet"/></span>&nbsp;&nbsp;<i class="fa fa-plus-circle"></i></a></li>
                  </ul>
              </div>
              <div class="fl-col fl-text-align-right datatable-search-view">
                  <form class="portlet-search-form form-inline" style="display:inline">
                      <label><spring:message code="search"/></label>
                      <input type="text" class="portlet-search-input form-control"/>
                  </form>
              </div>
          </div>
          <div style="clear:both"></div>
  >>>>>>> Stashed changes
      </div>
      <!-- Portlet Content -->
      <div class="fl-widget-content content portlet-content" role="main">
          <div>
              <table id="${n}portletsList" class="portlet-table table table-bordered table-hover" style="width:100%;">
                  <thead>
                      <tr>
                          <th><spring:message code="name"/></th>
                          <th><spring:message code="type"/></th>
                          <th><spring:message code="state"/></th>
                          <th><spring:message code="edit"/></th>
                          <th><spring:message code="delete"/></th>
                          <th><spring:message code="category"/></th>
                      </tr>
                  </thead>
              </table>
          </div>
      </div> <!-- end: portlet-body -->
  </div> <!-- end: portlet -->
  
  <script type="text/javascript">
  