removed conflicts

virtual-labs · Sep 7, 2021 · 5f7d7bf · 5f7d7bf
2 parents 2b8e0d4 + 515d232
commit 5f7d7bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/experiment/images/img1.PNG b/experiment/images/img1.PNG
diff --git a/experiment/theory.md b/experiment/theory.md
@@ -15,21 +15,20 @@ object.close()<br>
 While creating or opening a file, we need to enter the mode that we want it to open in. Some of the modes are :
 
 Name of mode	| Keywords | Syntax
-<<<<<<< HEAD
-:--|:--|:--|
-=======
 :--|:--|:--|:-:
->>>>>>> b572a16f9286bdca9a0ba34b8c25fa6c83ec12b4
 Read | r | open('file_name', 'r')
 Write | w | open('file_name', 'w')
 Append | a | open('file_name', 'a')
 
 Example :<br><br>
+
 <img src="images/img1.PNG"><br>
+
 Output : Hello!, My name is Jake.<br>
 
-<<<<<<< HEAD
 The above example is of creating a file and printing it.
-=======
+
+Output : Hello!, My name is Jake.<br>
+
 The above example is of creating a file and printing it.
->>>>>>> b572a16f9286bdca9a0ba34b8c25fa6c83ec12b4
+