sample28.rb in groupdocs-1.6.0

- old
+ new

@@ -51,21 +51,11 @@
 
       #Delete all annotations from document
       annotations.each do |annotation|
           annotation.remove!()
       end
-      case settings.base_path
 
-<<<<<<< HEAD
-        when 'https://stage-api-groupdocs.dynabic.com'
-          iframe = "<iframe width='100%' height='600' frameborder='0' src='http://stage-apps-groupdocs.dynabic.com/document-viewer/embed/#{settings.file_id}'></iframe>"
-        when 'https://dev-api-groupdocs.dynabic.com'
-          iframe = "<iframe width='100%' height='600' frameborder='0' src='http://dev-apps-groupdocs.dynabic.com/document-viewer/embed/#{settings.file_id}'></iframe>"
-        else
-          iframe = "<iframe width='100%' height='600' frameborder='0' src='https://apps.groupdocs.com/document-viewer/embed/#{settings.file_id}'></iframe>"
-      end
-=======
       #Prepare to sign url
       iframe = "/document-viewer/embed/#{settings.file_id}"
       # Construct result string
       url = GroupDocs::Api::Request.new(:path => iframe).prepare_and_sign_url
       #Generate iframe URL
@@ -78,20 +68,15 @@
           iframe = "https://apps.groupdocs.com#{url}"
       end
       #Make iframe
       iframe = "<iframe id='downloadframe' src='#{iframe}' width='800' height='1000'></iframe>"
 
->>>>>>> samples-dev
       message = 'Annotations was deleted from document'
     end
 
   rescue Exception => e
     err = e.message
   end
 
-<<<<<<< HEAD
-  # set variables for template
-=======
   #Set variables for template
->>>>>>> samples-dev
   haml :sample28, :locals => {:userId => settings.client_id, :privateKey => settings.private_key, :messages => message, :iframe => iframe, :fileId => settings.file_id, :err => err}
 end