1 files changed, 0 insertions, 4 deletions
diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index e069af925277..ef6baa9030cf 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -218,7 +218,6 @@ testcase tPCT
             hFileOpen (sDocument)
             sleep (10)
 
-<<<<<<< .working
             printlog "check if the document is writable"
             if fIsDocumentWritable = false then
                 printlog "make the document writable and check if it's succesfull"
@@ -227,9 +226,6 @@ testcase tPCT
                     goto endsub
                 endif
             endif
-=======
-    sMakeReadOnlyDocumentEditable
->>>>>>> .merge-right.r273634
 
             hTypeKeys ("<escape><tab>")
             fGetSizeXY sx1, sY, TRUE