website

commit 5a1d87eb817b6c34fcdb8c78aef34f314761be8b
parent a80b44a530e650431ed02fd136b19d1f0ee79063
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date:   Sat, 10 Dec 2022 22:07:41 +0200

Update README.md

Diffstat:
M
README.md
 | 
2
--

1 file changed, 0 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
@@ -1,9 +1,7 @@
 # Website
 
-<<<<<<< HEAD
 Personal site built with the [hugo](https://gohugo.io) framework and deployed with [netlify](https://netlify.com)
 =======
 [![Netlify Status](https://api.netlify.com/api/v1/badges/ef24cb24-3253-4c70-a0bf-3f1b5f326a8a/deploy-status)](https://app.netlify.com/sites/michaelneuper/deploys)
 
 Personal site built using the [hugo](https://gohugo.io) framework and deployed using [netlify](https://netlify.com)
->>>>>>> 21db979e5d13f34c73d4fecd87f0956df49b17af