merge.diff

--- /Users/alilloyd/Desktop/before.txt	2016-01-26 13:46:20.000000000 +0000
+++ /Users/alilloyd/Desktop/after.txt	2016-01-26 13:46:38.000000000 +0000
@@ -274,19 +274,15 @@
       put tNewInspectorName into tTargetInspector
       addInspectorToList tIndex
    end if
-   inspectorPositionPalette tIndex, tSelectedObjects
+   -- Only reposition if we are opening a new editor
+   if the mode of stack tTargetInspector is 0 then
+      inspectorPositionPalette tIndex, tSelectedObjects
+   end if
    unlock messages
    
    set the cSelectedObjects of stack tTargetInspector to tSelectedObjects
    
    lock messages
-<<<<<<< HEAD
-=======
-   -- Only reposition if we are opening a new editor
-   if the mode of stack tTargetInspector is 0 then
-      inspectorPositionPalette tIndex, tSelectedObjects
-   end if
->>>>>>> d82bafed33fc973a7070d43c27f6807abb8739a7
    palette stack tTargetInspector
    unlock messages
    unlock screen