aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-10-01 20:49:43 +0800
committerFabio Berger <me@fabioberger.com>2018-10-01 20:49:43 +0800
commit3d1c2cb29619bd503131204beca8e7a59d3130a6 (patch)
treedacd58dfd5b00b0f7d126e02a8ac4b313d1710e1
parentc7371cc0489f1db98c704ddeab216fd6d1c63dc1 (diff)
downloaddexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.tar
dexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.tar.gz
dexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.tar.bz2
dexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.tar.lz
dexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.tar.xz
dexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.tar.zst
dexon-sol-tools-3d1c2cb29619bd503131204beca8e7a59d3130a6.zip
Fix incorrect merge errors
-rw-r--r--packages/website/ts/components/dropdowns/developers_drop_down.tsx2
-rw-r--r--packages/website/ts/types.ts1
2 files changed, 1 insertions, 2 deletions
diff --git a/packages/website/ts/components/dropdowns/developers_drop_down.tsx b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
index 7d310df72..88522b665 100644
--- a/packages/website/ts/components/dropdowns/developers_drop_down.tsx
+++ b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
@@ -6,7 +6,7 @@ import { Container } from 'ts/components/ui/container';
import { DropDown } from 'ts/components/ui/drop_down';
import { Link } from 'ts/components/ui/link';
import { Text } from 'ts/components/ui/text';
-import { Deco, Key, ObjectMap, WebsitePaths } from 'ts/types';
+import { Deco, Key, WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
import { Translate } from 'ts/utils/translate';
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 31a33bb76..ece036858 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -472,7 +472,6 @@ export enum Key {
LiveChat = 'LIVE_CHAT',
LibrariesAndTools = 'LIBRARIES_AND_TOOLS',
More = 'MORE',
- OurMissionAndValues = 'OUR_MISSION_AND_VALUES',
}
export enum SmartContractDocSections {