diff options
| author | Zakaria BOUZIANE | 2014-07-07 17:15:10 +0200 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-07-07 17:15:10 +0200 |
| commit | a77d67e7807f90ea24e96b5c1a9e6bbb290170b0 (patch) | |
| tree | 80b395a4a06b41369a3cf3eb006f98ea14ed7f22 /config/environments/development.rb | |
| parent | 22c280f7042b554d8382b7d7511132efcd067ad6 (diff) | |
| parent | c5228e916b7b468a56c3c8a7441ac6973b875fff (diff) | |
| download | chouette-core-a77d67e7807f90ea24e96b5c1a9e6bbb290170b0.tar.bz2 | |
Merge branch 'tad_pmr' into sismo
Conflicts:
Gemfile
Gemfile.lock
db/schema.rb
Diffstat (limited to 'config/environments/development.rb')
| -rw-r--r-- | config/environments/development.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 842d9a471..f06db3fde 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -72,9 +72,9 @@ ChouetteIhm::Application.configure do config.to_prepare do Devise::Mailer.layout "mailer" #ApplicationMap.ign_api_key = "i2aqyge3x3iovnuhz7z06flp" - chouette_command_script = "tmp/chouette-command/chouette" + chouette_command_script = "/home/zbouziane/Projects/dryade/chouette2_dev/tmp/chouette-command/chouette" if File.exists? chouette_command_script - Chouette::Command.command = "tmp/chouette-command/chouette" + Chouette::Command.command = "/home/zbouziane/Projects/dryade/chouette2_dev/tmp/chouette-command/chouette" else Chouette::Command.command = "true" end |