解决线上冲突

app/controllers/courses_controller.rb

@@ -12,7 +12,7 @@ class CoursesController < ApplicationController
   helper :graduation_tasks
   include ApplicationHelper
   helper SyllabusesHelper
-  
+
   # before_filter :auth_login1, :only => [:show, :course_activity, :feedback]
   if Redmine::Configuration['gitlab_address'].include?("test")
     skip_before_filter :verify_authenticity_token, :only => [:update_course_module, :join_course_multi_role]

lib/gitlab-cli/bin/gitlab

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+#
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'gitlab/cli'

lib/grack/bin/testserver

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 Bundler.require(:default, :development)
 
-
 require 'grack'
 require 'rack'
 root = File.absolute_path( File.join( File.dirname(__FILE__), '../examples' ) )

public/react/src/modules/page/component/TPICodeMirror.js

@@ -12,7 +12,6 @@ import Drawer from 'material-ui/Drawer';
 import './TPICodeMirror.css'
 import TPICodeSetting from './TPICodeSetting'
 
-
 import { fromStore, toStore } from 'educoder'
 require('codemirror/lib/codemirror.css');
 // require('codemirror/mode/javascript/javascript');