From ebc76e27fa130236d6406213ad8a35b3b1a4dd24 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Mon, 25 Jun 2018 14:22:43 +0100
Subject: [PATCH] fix merge

---
 .../src/app/documentlist/documentlist.component.html            | 1 -
 .../src/app/documentlist/documentlist.component.spec.ts         | 2 --
 .../src/app/documentlist/documentlist.component.html            | 1 -
 .../src/app/documentlist/documentlist.component.spec.ts         | 2 --
 4 files changed, 6 deletions(-)

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.html b/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.html
index b6b89e79..ed8a464d 100644
--- a/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.html
+++ b/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.html
@@ -18,7 +18,6 @@
 
 </adf-toolbar>
 
-
 <adf-document-list
   #documentList
   currentFolderId="-root-"
diff --git a/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.spec.ts
index 70c7a8e0..2aa360fb 100644
--- a/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.spec.ts
+++ b/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.spec.ts
@@ -1,5 +1,4 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Location } from '@angular/common';
 import { SpyLocation } from '@angular/common/testing';
 import { AdfModule } from '../adf.module';
@@ -9,7 +8,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core';
 
-import { AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core';
 
 describe('DocumentlistComponent', () => {
   let component: DocumentlistComponent;
diff --git a/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.html b/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.html
index b6b89e79..ed8a464d 100644
--- a/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.html
+++ b/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.html
@@ -18,7 +18,6 @@
 
 </adf-toolbar>
 
-
 <adf-document-list
   #documentList
   currentFolderId="-root-"
diff --git a/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.spec.ts b/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.spec.ts
index 60431bc3..58665052 100644
--- a/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.spec.ts
+++ b/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.spec.ts
@@ -9,8 +9,6 @@ import { PreviewService } from '../services/preview.service';
 import { AlfrescoApiServiceMock, AlfrescoApiService} from '@alfresco/adf-core';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import {  AlfrescoApiServiceMock, AlfrescoApiService} from '@alfresco/adf-core';
-
 describe('DocumentlistComponent', () => {
   let component: DocumentlistComponent;
   let fixture: ComponentFixture<DocumentlistComponent>;