website

commit b09ce4fee89f951363e92839b12deb4d51040b47
parent de6641cedf963070d8b3e8645925d91967a05d7a
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date:   Sat, 10 Dec 2022 21:30:00 +0200

Update README.md

Diffstat:
M
README.md
 | 
6
++++++

1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/README.md b/README.md
@@ -1,3 +1,9 @@
 # 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