Skip to content
Snippets Groups Projects
Commit ab814567 authored by Nour, Arezou's avatar Nour, Arezou
Browse files

Merge branch 'pull' into 'master'

Pull

See merge request !2
parents 01016d5d fdbdf3ae
No related branches found
No related tags found
1 merge request!2Pull
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
<p>This is the first file in my new Git Repo.</p> <p>This is the first file in my new Git Repo.</p>
<div><img src="img_hello_world.jpg" alt="Hello World from Space" <div><img src="img_hello_world.jpg" alt="Hello World from Space"
style="width:100%;max-width:960px"></div>
</body> </body>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<p>This line is here to show how merging works.</p> <p>This line is here to show how merging works.</p>
<p>This is the new line.</p> <p>This is the new line.</p>
<p>A new line in our file!</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment