NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Finally worky?

Browse source
This commit is contained in:
Eric Schultz 2018-11-08 15:39:21 -06:00 committed by Luis Castro
parent 1685846828
commit c743fac976
No known key found for this signature in database
GPG key ID: 0A8F33D4C4E27639
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/environments/ci.rb
View file

@ -1,6 +1,5 @@
# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
Commitchange::Application.configure do Commitchange::Application.configure do
<<<<<<< HEAD
# Settings specified here will take precedence over those in config/application.rb # Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on # In the development environment your application's code is reloaded on
@ -57,5 +56,4 @@ Commitchange::Application.configure do
config.after_initialize do config.after_initialize do
ActiveRecord::Base.logger = nil ActiveRecord::Base.logger = nil
end end
end end