manos/WWW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:delkappa/delkappa

Browse Source
This commit is contained in:
Manos Katsomallos
2018-01-30 09:32:44 +01:00
parent 9d7f370737 b0fe95855b
commit df8a658822
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@ -1,3 +1,5 @@
<<<<<<< HEAD
=======
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 8 ]><html class="no-js ie ie7" lang="en"> <![endif]--> <!--[if lt IE 8 ]><html class="no-js ie ie7" lang="en"> <![endif]-->
<!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]--> <!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]-->
@ -449,3 +451,4 @@
</body> </body>
</html> </html>
>>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891