write in 1 single line actions with no body

Conflicts:
	app/controllers/admin/contacts_controller.rb

app/controllers/admin/campaigns_controller.rb

@@ -21,11 +21,9 @@ module Admin
       end
     end
 
-    def new
-    end
+    def new; end
 
-    def edit
-    end
+    def edit; end
 
     def update
       if @campaign.update_attributes(params[:campaign])

app/controllers/admin/commercials_controller.rb

@@ -11,8 +11,7 @@ module Admin
       @commercial = @conference.commercials.build
     end
 
-    def edit
-    end
+    def edit; end
 
     def create
       @commercial = @conference.commercials.build(commercial_params)

app/controllers/admin/events_controller.rb

@@ -124,8 +124,7 @@ module Admin
       redirect_back_or_to(admin_conference_event_path(@conference.short_title, @event))
     end
 
-    def create
-    end
+    def create; end
 
     def accept
       send_mail = @event.conference.email_settings.send_on_accepted

app/controllers/admin/lodgings_controller.rb

@@ -8,8 +8,7 @@ module Admin
       authorize! :update, Lodging.new(venue_id: @venue.id)
     end
 
-    def show
-    end
+    def show; end
 
     def update
       if @venue.update_attributes(params[:venue])

app/controllers/admin/photos_controller.rb

@@ -14,8 +14,7 @@ module Admin
     end
 
 # GET /admin/photos/1/edit
-    def edit
-    end
+    def edit; end
 
 # POST /admin/photos
     def create

app/controllers/admin/users_controller.rb

@@ -24,8 +24,7 @@ module Admin
       redirect_to admin_users_path, notice: "Updated #{@user.email}"
     end
 
-    def edit
-    end
+    def edit; end
 
     def destroy
       @user.destroy

app/controllers/admin/venue_controller.rb

@@ -3,8 +3,7 @@ module Admin
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :venue, through: :conference, singleton: true
 
-    def index
-    end
+    def index; end
 
     def update
       @venue = @conference.venue

app/controllers/commercials_controller.rb

@@ -8,8 +8,7 @@ class CommercialsController < ApplicationController
     authorize! :new, @commercial
   end
 
-  def edit
-  end
+  def edit; end
 
   def create
     @commercial = @event.commercials.build(commercial_params)

app/controllers/conference_controller.rb

@@ -1,8 +1,7 @@
 class ConferenceController < ApplicationController
   load_and_authorize_resource find_by: :short_title
 
-  def show
-  end
+  def show; end
 
   def subscribe
     conference = Conference.find_by_short_title(params[:id])

app/controllers/event_attachments_controller.rb

@@ -42,8 +42,7 @@ class EventAttachmentsController < ApplicationController
     end
   end
 
-  def edit
-  end
+  def edit; end
 
   def create
     params[:event_attachment][:title] = params[:title][0]