diff options
| author | Marak Squires <[email protected]> | 2010-05-15 01:56:08 -0400 |
|---|---|---|
| committer | Marak Squires <[email protected]> | 2010-05-15 01:56:08 -0400 |
| commit | a2f15df538b856109cf34ebb24d3055cbca99b0b (patch) | |
| tree | 45f64e1d660fd48bb18ad6d55000cb29a913aee3 /lib | |
| parent | 70b3087fa6a4ad8179bb8415c413d03f91f1d636 (diff) | |
| download | faker-a2f15df538b856109cf34ebb24d3055cbca99b0b.tar.xz faker-a2f15df538b856109cf34ebb24d3055cbca99b0b.zip | |
merge
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/internet.js | 4 |
1 files changed, 0 insertions, 4 deletions
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() { |