Fix merge conflict

cjoudrey · cjoudrey · commit 75a97043e137 · 2017-02-12T23:59:53.000-05:00
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
@@ -2,9 +2,6 @@ class GraphqlController < ApplicationController
   before_action :authenticate
 
   def execute
-    context = {
-      user: @user,
-    }
     query_string = params[:query].to_s
     variables = ensure_hash(params[:variables])
     context = {
