removing conflicts

Author: coco3427

source/ch8_filehandling.ptx

@@ -489,11 +489,7 @@
         <p>
             And that's it! We will add our code to the foundational code for a complete program. First, an example of equivalent Python code:
         </p>
-<<<<<<< HEAD
         <datafile label="my-file-8-4-4" filename="myfile.txt" xml:id= "my-file-8-4-4" editable="yes">
-=======
-        <datafile label="my-file-8-4-4" filename="newfile.txt" xml:id= "my-file-8-4-4" editable="yes" include-source="yes">
->>>>>>> 0633649 (fixes file not found errors in 8.4)
                 <pre>
 
                 </pre>
@@ -514,16 +510,12 @@
         <p>
             The completed Java code:
         </p>
-<<<<<<< HEAD
         <datafile label="my-file-8-4-5" filename="myfile.txt" xml:id= "my-file-8-4-5" editable="yes">
                 <pre>
 
                 </pre>
             </datafile>
         <program xml:id="file-write-exp5" interactive="activecode" language="java" add-files = "my-file-8-4-5">
-=======
-        <program interactive="activecode" language="java">
->>>>>>> 0633649 (fixes file not found errors in 8.4)
             <code>
             import java.io.FileWriter;
             import java.io.IOException;
@@ -565,17 +557,12 @@
         <p>
             Now, when we use <c>write()</c> method like before, the text will be appended if there is already text in the document. If we were to update our code to include the boolean argument:
         </p>
-<<<<<<< HEAD
         <datafile label="my-file-8-4-6" filename="myfile.txt" xml:id= "my-file-8-4-6" editable="yes">
                 <pre>
 
                 </pre>
             </datafile>
         <program xml:id="file-write-exp6" interactive="activecode" language="java" add-files = "my-file-8-4-6">
-=======
-        
-        <program interactive="activecode" language="java">
->>>>>>> 0633649 (fixes file not found errors in 8.4)
             <code>
             import java.io.FileWriter;
             import java.io.IOException;
@@ -801,4 +788,4 @@
         </reading-questions>
     </section>
 
-</chapter>
+</chapter>