Skip to content
Snippets Groups Projects
Commit c3dc1424 authored by Mohammed Shorif's avatar Mohammed Shorif
Browse files

Testing merge conflict.

parent 1d0ec983
No related branches found
No related tags found
1 merge request!33Testing merge conflict.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
width: 30%; width: 30%;
} }
h1 { h1 {
color: black; color: black;
font-family: arial, sans-serif; font-family: arial, sans-serif;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment