scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove badly merged code

Browse source
This commit is contained in:
Jure Grabnar 2016-08-08 13:06:20 +02:00
parent 4bd489d29c
commit deecbf082c
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/experiments_controller.rb
View file

@ -57,12 +57,7 @@ class ExperimentsController < ApplicationController
if @experiment.save
flash[:success] = t('experiments.update.success_flash',
experiment: @experiment.name)
<<<<<<< HEAD
redirect_to canvas_experiment_path(@experiment)
=======
redirect_to project_path(@experiment.project)
>>>>>>> a4ec5585965a7a8e565d7ee9072a26e52ccd9fd3
else
flash[:alert] = t('experiments.update.error_flash')
redirect_to :back