From a2f15df538b856109cf34ebb24d3055cbca99b0b Mon Sep 17 00:00:00 2001 From: Marak Squires Date: Sat, 15 May 2010 01:56:08 -0400 Subject: merge --- lib/internet.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lib') diff --git a/lib/internet.js b/lib/internet.js index ab65b6dc..9e7a8539 100644 --- a/lib/internet.js +++ b/lib/internet.js @@ -6,9 +6,6 @@ exports.email = function() { }; exports.userName = function() { -<<<<<<< HEAD - -======= switch(Helper.randomNumber(2)) { case 0: @@ -22,7 +19,6 @@ exports.userName = function() { exports.domainName = function() { return this.domainWord() + "." + Helper.randomize(definitions.domain_suffix); ->>>>>>> c5abfe4ae7b288a3293e1dec02895995935048f8 }; exports.domainWord = function() { -- cgit v1.2.3