Update README examples and make custom factory name explicit

thom4parisot · Feb 13, 2017 · 13df668 · 13df668
1 parent 5f8d3f0
commit 13df668
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -170,19 +170,12 @@ const tldjs = require('tldjs');
 tldjs.getDomain('localhost');           // returns null
 tldjs.getSubdomain('vhost.localhost');  // returns null
 
-<<<<<<< HEAD
 const myTldjs = tldjs.fromUserSettings({
   validHosts: ['localhost']
 });
 
 myTldjs.getDomain('localhost');           // returns 'localhost'
 myTldjs.getSubdomain('vhost.localhost');  // returns 'vhost'
-=======
-var customTld = tld.init(['localhost']);
-
-customTld.getDomain('localhost');           // returns 'localhost'
-customTld.getSubdomain('vhost.localhost');  // returns 'vhost'
->>>>>>> Add documentation and simplify #init signature
 ```
 
 ## Updating the TLDs List

diff --git a/index.js b/index.js
@@ -13,7 +13,6 @@ var tldExists = require('./lib/tld-exists.js');
 
 /**
  * Creates a new instance of tldjs
- *
  * @param  {Object.<rules,validHosts>} options [description]
  * @return {tldjs|Object}                      [description]
  */