Testing

2020-08-16 15:06:05 +02:00 · 2020-08-16 15:06:05 +02:00 · 4753ad4bdd
parent 860a4380c4
commit 4753ad4bdd
1 changed files with 2 additions and 1 deletions
--- a/index.md
+++ b/index.md
@ -1,7 +1,8 @@
 ---
 layout: default
 ---
-<<<<<<< HEAD
+Testing
+
 Prosjekter, dokumenter og annet
 -------------------------------
 * [NTNU prosjekter og filer](./files/ntnu/)