resolve conflict

bertmckay79 · Oct 21, 2018 · b5bf364 · b5bf364
2 parents 7ded5dd + ef59eca
commit b5bf364
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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"],