fix merge

Alfresco · Jun 25, 2018 · ebc76e2 · ebc76e2
1 parent 9c2d46e
commit ebc76e2
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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>;