aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler <[email protected]>2018-10-20 19:56:29 -0700
committerTyler <[email protected]>2018-10-20 19:56:29 -0700
commitb5bf3649796c5497f3d89450b6dc12dc5c10bd3d (patch)
tree949ed567084cb71813595081f3891526d4e88cb1
parent7ded5dd46270454f7d6c0417c8ea406c7113feb1 (diff)
parentef59eca978b91b25cb26ca958cd5aa9ad15b0a31 (diff)
downloadfaker-b5bf3649796c5497f3d89450b6dc12dc5c10bd3d.tar.xz
faker-b5bf3649796c5497f3d89450b6dc12dc5c10bd3d.zip
resolve conflict
-rw-r--r--lib/index.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/index.js b/lib/index.js
index 9de7ca10..ed073773 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -105,6 +105,7 @@ function Faker (opts) {
var Vehicle = require('./vehicle');
self.vehicle = bindAll(new Vehicle(self));
+
var _definitions = {
"name": ["first_name", "last_name", "prefix", "suffix", "gender", "title", "male_prefix", "female_prefix", "male_first_name", "female_first_name", "male_middle_name", "female_middle_name", "male_last_name", "female_last_name"],
"address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr"],