Drift/pvv-nixos-config
Drift
/
pvv-nixos-config
16
4
Fork 1
Code Issues Pull Requests 6 Wiki Activity

Remove merge cruft.

This commit is contained in:
Yorin Anne De Jong 2016-08-17 23:58:54 +02:00
parent a4181b98ac
commit f91d62e69f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/index.php
View File

@ -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">