Resolving conflict with app/serializers/variable_entity.rb

9966b360 · Ian Baum · fa5c812a · 9966b360
Commit 9966b360 authored Feb 07, 2018 by Ian Baum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/serializers/variable_entity.rb app/serializers/variable_entity.rb +0 -3

No files found.
--- a/app/serializers/variable_entity.rb
+++ b/app/serializers/variable_entity.rb
 class VariableEntity < Grape::Entity
-<<<<<<< HEAD
  prepend ::EE::VariableEntity

-=======
->>>>>>> upstream/master
  expose :id
  expose :key
  expose :value