Remove merge cruft.
This commit is contained in:
parent
a4181b98ac
commit
f91d62e69f
|
@ -1,9 +1,4 @@
|
||||||
<<<<<<< e4e8b0972bbec3fff581f7a97b34315265104f3a
|
|
||||||
<?php require '../src/_autoload.php'; ?><!DOCTYPE html>
|
<?php require '../src/_autoload.php'; ?><!DOCTYPE html>
|
||||||
=======
|
|
||||||
<?php require "../src/_autoload.php"; ?>
|
|
||||||
<!DOCTYPE html>
|
|
||||||
>>>>>>> Add automatic agenda on front page.
|
|
||||||
<title>Programvareverkstedet</title>
|
<title>Programvareverkstedet</title>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
|
||||||
|
|
Loading…
Reference in New Issue