lib/octopolo/config.rb in octopolo-1.2.1 vs lib/octopolo/config.rb in octopolo-1.3.0

@@ -42,9 +42,13 @@
 
     def github_repo
       @github_repo || raise(MissingRequiredAttribute, "GitHub Repo is required")
     end
 
+    def merge_resolver
+      @merge_resolver 
+    end
+
     def user_notifications
       if [NilClass, Array, String].include?(@user_notifications.class)
         Array(@user_notifications) if @user_notifications
       else
         raise(InvalidAttributeSupplied, "User notifications must be an array or string")