Some stupid comment
This commit is contained in:
parent
64639a7834
commit
6dc7a5485e
1 changed files with 0 additions and 4 deletions
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
|
@ -13,6 +12,3 @@
|
|||
<script type="text/javascript" src="js/wyrian.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
=======
|
||||
blbabnlazblk
|
||||
>>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d
|
||||
|
|
Loading…
Reference in a new issue