Merged conflicts.

app/views/editor/level/components/ComponentsTabView.coffee

@@ -94,10 +94,3 @@ class LevelComponentNode extends TreemaObjectNode
         m.get('original') is data.original and m.get('version').major is data.majorVersion
       name = "#{comp.get('system')}.#{comp.get('name')} v#{comp.get('version').major}"
     @buildValueForDisplaySimply valEl, "#{name} (#{count})"
-<<<<<<< HEAD
-
-  onEnterPressed: ->
-    data = @getData()
-    Backbone.Mediator.publish 'edit-level-component', original: data.original, majorVersion: data.majorVersion
-=======
->>>>>>> master

app/views/editor/level/scripts/ScriptsTabView.coffee

@@ -89,11 +89,7 @@ module.exports = class ScriptsTabView extends CocoView
     @selectedScriptPath = newPath
 
   getThangIDs: ->
-<<<<<<< HEAD
-    (t.id for t in @level.get('thangs') ? [] when t.id isnt 'Interface')
-=======
-    (t.id for t in @level.get('thangs'))
->>>>>>> master
+    (t.id for t in @level.get('thangs') ? [])
 
   onNewScriptAdded: (scriptNode) =>
     return unless scriptNode
@@ -169,13 +165,8 @@ class EventPropsNode extends TreemaNode.nodeMap.string
     joined = '(unset)' if not joined.length
     @buildValueForDisplaySimply valEl, joined
 
-<<<<<<< HEAD
   buildValueForEditing: (valEl, data) -> 
     super(valEl, data)
-=======
-  buildValueForEditing: (valEl) ->
-    super(valEl)
->>>>>>> master
     channel = @getRoot().data.channel
     channelSchema = Backbone.Mediator.channelSchemas[channel]
     autocompleteValues = []

app/views/editor/level/settings/SettingsTabView.coffee

@@ -30,12 +30,8 @@ module.exports = class SettingsTabView extends CocoView
     schema = _.cloneDeep Level.schema
     schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
     schema.required = _.intersection schema.required, @editableSettings
-<<<<<<< HEAD
     schema.default = _.pick schema.default, (value, key) => key in @editableSettings
-    thangIDs = @getThangIDs()
-=======
     @thangIDs = @getThangIDs()
->>>>>>> master
     treemaOptions =
       filePath: "db/level/#{@level.get('original')}"
       supermodel: @supermodel
@@ -53,11 +49,7 @@ module.exports = class SettingsTabView extends CocoView
     @settingsTreema.open()
 
   getThangIDs: ->
-<<<<<<< HEAD
-    (t.id for t in @level.get('thangs') ? [] when t.id isnt 'Interface')
-=======
-    (t.id for t in @level.get('thangs'))
->>>>>>> master
+    (t.id for t in @level.get('thangs') ? [])
 
   onSettingsChanged: (e) =>
     $('.level-title').text @settingsTreema.data.name

app/views/editor/level/systems/SystemsTabView.coffee

@@ -147,12 +147,8 @@ class LevelSystemNode extends TreemaObjectNode
 
   onEnterPressed: (e) ->
     super e
-<<<<<<< HEAD
     data = @getData()
-    Backbone.Mediator.publish 'edit-level-system', original: data.original, majorVersion: data.majorVersion
-=======
-    Backbone.Mediator.publish 'editor:edit-level-system', original: @data.original, majorVersion: @data.majorVersion
->>>>>>> master
+    Backbone.Mediator.publish 'editor:edit-level-system', original: data.original, majorVersion: data.majorVersion
 
   open: (depth) ->
     super depth

app/views/editor/level/thangs/ThangsTabView.coffee

@@ -529,8 +529,4 @@ class ThangNode extends TreemaObjectNode
     @buildValueForDisplaySimply valEl, s
 
   onEnterPressed: ->
-<<<<<<< HEAD
-    Backbone.Mediator.publish 'edit-level-thang', thangID: @getData().id
-=======
-    Backbone.Mediator.publish 'editor:edit-level-thang', thangID: @data.id
->>>>>>> master
+    Backbone.Mediator.publish 'editor:edit-level-thang', thangID: @getData().id

bower.json

@@ -39,13 +39,8 @@
     "d3": "~3.4.4",
     "jsondiffpatch": "~0.1.5",
     "nanoscroller": "~0.8.0",
-<<<<<<< HEAD
-    "jquery.tablesorter": "~2.15.13",
     "treema": "https://github.com/codecombat/treema.git#release/0.1.0",
-=======
     "jquery.tablesorter": "~2",
-    "treema": "~0.0.14",
->>>>>>> master
     "bootstrap": "~3.1.1",
     "validated-backbone-mediator": "~0.1.3",
     "jquery.browser": "~0.0.6",