lib/phrase/models/branch_merge_parameters.rb in phrase-2.8.0 vs lib/phrase/models/branch_merge_parameters.rb in phrase-2.8.1

- old
+ new

@@ -1,9 +1,9 @@ require 'date' module Phrase class BranchMergeParameters - # strategy used for merge blocking, use_master or use_branch + # strategy used for merge blocking, use_main or use_branch attr_accessor :strategy # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map {