From b4acbfe740dfc71c901bfccbacc4d854d0cf49cb Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 8 Aug 2018 12:38:21 -0400
Subject: [PATCH] conflict in action

---
 embark-ui/src/actions/index.js | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/embark-ui/src/actions/index.js b/embark-ui/src/actions/index.js
index d091d6b3..1b696ca6 100644
--- a/embark-ui/src/actions/index.js
+++ b/embark-ui/src/actions/index.js
@@ -74,22 +74,8 @@ export const processLogs = {
   request: (processName) => action(PROCESS_LOGS[REQUEST], {processName}),
   success: (processLogs) => action(PROCESS_LOGS[SUCCESS], {processLogs}),
   failure: (error) => action(PROCESS_LOGS[FAILURE], {error})
-export function initBlockHeader(){
-  return {
-    type: INIT_BLOCK_HEADER
-  };
-}
-
-export function fetchContractProfile(contractName) {
-  return {
-    type: FETCH_CONTRACT_PROFILE,
-    contractName
-  };
-}
-
 };
 
-
 export const CONTRACTS = createRequestTypes('CONTRACTS');
 export const contracts = {
   request: () => action(CONTRACTS[REQUEST]),
@@ -148,4 +134,4 @@ export const messageListen = {
   request: (channel) => action(MESSAGE_LISTEN[REQUEST], {channel}),
   success: (message) => action(MESSAGE_LISTEN[SUCCESS], {message}),
   failure: (error) => action(MESSAGE_LISTEN[FAILURE], {error})
-};
\ No newline at end of file
+};