From f7641dbe29a5dbc665aa76a94678ed4647195e83 Mon Sep 17 00:00:00 2001
From: Ricardo Guilherme Schmidt <3esmit@gmail.com>
Date: Wed, 5 Sep 2018 00:39:25 -0300
Subject: [PATCH] fix in merge

---
 app/components/ens/registerSubDomain.js | 1 -
 config/ens-usernames/reservedNames.js   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/components/ens/registerSubDomain.js b/app/components/ens/registerSubDomain.js
index 754f61a..0995fe8 100644
--- a/app/components/ens/registerSubDomain.js
+++ b/app/components/ens/registerSubDomain.js
@@ -153,7 +153,6 @@ const RegisterSubDomain = withFormik({
     const { address, statusAddress } = values;
     const { subDomain, domainName, registeredCallbackFn } = props || values;
     const { methods: { register } } = UsernameRegistrar;
-    const { methods: { setAddr, setPubkey } } = PublicResolver;
     const subdomainHash = soliditySha3(subDomain);
     const domainNameHash = hash(domainName);
     const resolveToAddr = address || zeroAddress;
diff --git a/config/ens-usernames/reservedNames.js b/config/ens-usernames/reservedNames.js
index 6b7fa00..c925153 100644
--- a/config/ens-usernames/reservedNames.js
+++ b/config/ens-usernames/reservedNames.js
@@ -1,4 +1,4 @@
-exports.reservedNames = [
+exports.ReservedUsernames = [
 	//Ethereum reserved words
 	'eth',
 	'ether',