merge errors

app/controllers/documents_controller.rb

@@ -18,10 +18,9 @@ class DocumentsController < ApplicationController
   end
   def edit
     @document = Document.find(params[:id])
-<<<<<<< HEAD
+
     @parent=@document.parent
-=======
->>>>>>> origin/documentmeeting
+
     respond_to do |format|
        format.js
     end
@@ -30,11 +29,9 @@ class DocumentsController < ApplicationController
 
   def create
     @document = Document.new(params[:document])
-<<<<<<< HEAD
-    @parent=@document.parent
-=======
 
->>>>>>> origin/documentmeeting
+    @parent=@document.parent
+
     respond_to do |format|
       if @document.save
        # format.html { redirect_to @document, notice: 'Document was successfully created.' }
@@ -48,15 +45,11 @@ class DocumentsController < ApplicationController
     end
   end
 
-<<<<<<< HEAD
+
   def update
     @document = Document.find(params[:id])
     @parent=@document.parent
-=======
-def update
-    @document = Document.find(params[:id])
 
->>>>>>> origin/documentmeeting
     respond_to do |format|
       if @document.update_attributes(params[:document])
         format.html { redirect_to @document, notice: 'Document was successfully updated.' }
@@ -72,10 +65,9 @@ def update
   def destroy
     logger.info("-------------delete------------------")
     @document = Document.find(params[:id])
-<<<<<<< HEAD
+
     @parent=@document.parent
-=======
->>>>>>> origin/documentmeeting
+
     @document_id = params[:id]  
    
     @document.destroy