From f1808c75f9decf1227f8053bc692bee36fe308c0 Mon Sep 17 00:00:00 2001 From: insanity Date: Tue, 18 Sep 2018 21:28:33 +0900 Subject: [PATCH] merge --- src/app/pages/home/home-page.component.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/pages/home/home-page.component.ts b/src/app/pages/home/home-page.component.ts index 1e7e48a..884fa18 100644 --- a/src/app/pages/home/home-page.component.ts +++ b/src/app/pages/home/home-page.component.ts @@ -14,12 +14,7 @@ import { Node } from '../../../commons/model/node'; import { Link } from '../../../commons/model/link'; import { RPCError } from '@overflow/rpc-js'; -<<<<<<< HEAD -import { toMetaIPType, MetaIPTypeEnum, toMetaCryptoType, MetaCryptoTypeEnum } from '@overflow/model/meta'; -======= import { toMetaIPType, MetaIPTypeEnum, toMetaCryptoType, MetaCryptoTypeEnum, toMetaPortType, MetaPortTypeEnum } from '@overflow/model/meta'; -import { Message } from 'primeng/primeng'; ->>>>>>> 42243565d710c6f755deb99207bfaa337ffbbc78 import { DiscoveryModeType } from '@overflow/model/discovery/discovery'; import { PingResult } from '@overflow/model/ping';