Add documentation and simplify #init signature

thom4parisot · Feb 13, 2017 · 5f8d3f0 · 5f8d3f0
1 parent 8b6565b
commit 5f8d3f0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -170,12 +170,19 @@ 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