From f7e97f3020ddc89199584ea5aef4619161595f4f Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Mon, 31 Jan 2022 19:55:19 +0200 Subject: [PATCH] seems i misspoke --- src/views/ContactsPage/ContactsPageView.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 7360bb3..fd6f16e 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -5,31 +5,22 @@ import colors from "@theme/colors"; import ContactCard from "@components/ContactCard"; import BoardJson from "./board.json"; -<<<<<<< HEAD -import UtmkJson from "./utmk.json"; -import YtmkJson from "./ytmk.json"; -import Others from "./others.json"; -======= import HvtmkJson from "./hvtmk.json"; import MtmkJson from "./mtmk.json"; import OptmkJson from "./optmk.json"; ->>>>>>> ed6e32dc3fd6e70654686ac34422dcc6a09edc75 import OtmkJson from "./otmk.json"; import EPtmkJson from "./eptmk.json"; import SstmkJson from "./sstmk.json"; import TtmkJson from "./ttmk.json"; +import UtmkJson from "./utmk.json"; +import YtmkJson from "./ytmk.json"; +import Others from "./others.json"; const orderedCommittees = [ BoardJson, -<<<<<<< HEAD - UtmkJson, - YtmkJson, - Others, -======= HvtmkJson, MtmkJson, OptmkJson, ->>>>>>> ed6e32dc3fd6e70654686ac34422dcc6a09edc75 OtmkJson, EPtmkJson, SstmkJson,