examples/api-samples/views/sample28.haml in groupdocs-1.5.8 vs examples/api-samples/views/sample28.haml in groupdocs-1.5.9

@@ -41,13 +41,21 @@
       %input{:type=>'text', :name=>'basePath'}
       %br/
       %br/
       %input{:type => 'submit', :value => 'Delete all annotations'}/
   %div{:style => 'padding:20px; border:1px solid black;'}
+<<<<<<< HEAD
     %p
       Results:
       %br/
       %font{:color => 'green'}#{(defined? messages) ? messages : ''}
       #{(defined? iframe) ? iframe : ''}
       %br/
+=======
+    Results:
+    %br/
+    %span{:style => 'color:green'}#{(defined? messages) ? messages : ''}
+    #{(defined? iframe) ? iframe : ''}
+    %br/
+>>>>>>> samples-dev
 
 = partial :_others_samples
\ No newline at end of file