lib/phenomenal_rails.rb in phenomenal_rails-1.2.4 vs lib/phenomenal_rails.rb in phenomenal_rails-1.2.5

@@ -9,11 +9,12 @@
 require "phenomenal_rails/resolver"
 require "phenomenal_rails/path_set"
 
 # Set default feature as persistent
 phen_default_feature.persistent=true
+phen_change_conflict_policy { |a,b| priority_conflict_policy(a,b) }
 
 
-module PhenomenalRails 
+module PhenomenalRails
   # Phenomenal application folder
   PATH = "app_phenomenal"
 end