fixes for conflicts with master

This commit is contained in:
lotte
2019-01-22 09:46:55 +01:00
parent 6dba02ca67
commit c4004eaaa2
14 changed files with 130 additions and 125 deletions

View File

@@ -1,8 +1,8 @@
import {Component} from '@angular/core';
import {first} from 'rxjs/operators';
import {RestResponse} from '../../../core/cache/response-cache.models';
import {AbstractSimpleItemActionComponent} from '../simple-item-action/abstract-simple-item-action.component';
import {getItemEditPath} from '../../item-page-routing.module';
import { Component } from '@angular/core';
import { first } from 'rxjs/operators';
import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
import { getItemEditPath } from '../../item-page-routing.module';
import { RestResponse } from '../../../core/cache/response.models';
@Component({
selector: 'ds-item-delete',