From 4753ad4bdd9688ed7aa13bc3bc9ed36dd94771b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Skaaden?= <oyvindskaaden@gmail.com>
Date: Sun, 16 Aug 2020 15:06:05 +0200
Subject: [PATCH] Testing

---
 index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.md b/index.md
index 0e81cc5..a625828 100644
--- a/index.md
+++ b/index.md
@@ -1,7 +1,8 @@
 ---
 layout: default
 ---
-<<<<<<< HEAD
+Testing
+
 Prosjekter, dokumenter og annet
 -------------------------------
 * [NTNU prosjekter og filer](./files/ntnu/)