From 1d9a5d90cf35aae1840ae2f05540489eba1f5abc Mon Sep 17 00:00:00 2001
From: Igor Gassmann <igor@lbry.io>
Date: Mon, 27 Nov 2017 21:01:33 -0300
Subject: [PATCH] Fix merge conflicts

---
 README.md                                   | 5 +----
 build/build.ps1                             | 4 ----
 {ui => src/renderer}/js/util/redux-utils.js | 0
 3 files changed, 1 insertion(+), 8 deletions(-)
 rename {ui => src/renderer}/js/util/redux-utils.js (100%)

diff --git a/README.md b/README.md
index fec117926..1df36340d 100644
--- a/README.md
+++ b/README.md
@@ -66,11 +66,8 @@ python -m pip install -r build\requirements.txt
 npm install -g yarn
 yarn install
 ```
-<<<<<<< HEAD
+
 3. Change directory to `src\main` and run the following:
-=======
-3. Change directory to `src\main` and run the following;
->>>>>>> dbf0fae5... Update file structure to follow electron-webpack guidelines
 ```
 yarn install
 node_modules\.bin\electron-rebuild
diff --git a/build/build.ps1 b/build/build.ps1
index 4a62e5bcd..c7e454e8d 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -17,11 +17,7 @@ cd ..\..
 
 
 # build ui
-<<<<<<< HEAD
 cd src\renderer
-=======
-cd main\renderer
->>>>>>> dbf0fae5... Update file structure to follow electron-webpack guidelines
 yarn install
 npm rebuild node-sass
 node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\
diff --git a/ui/js/util/redux-utils.js b/src/renderer/js/util/redux-utils.js
similarity index 100%
rename from ui/js/util/redux-utils.js
rename to src/renderer/js/util/redux-utils.js