add image and link to university in readme

asteinbr · Oct 28, 2019 · c5a78d0 · c5a78d0
2 parents 0cb7a76 + 301a2b9
commit c5a78d0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 [![alt text](image "tooltip")](hyperlink)
 <img width="200" height="92" src="https://www.frankfurt-university.de/typo3conf/ext/dkd_fuas/Resources/Public/Images/logo.svg" alt="Frankfurt University of Applied Science Logo" />
 
+=======
+[![Frankfurt University of Applied Science](https://www.frankfurt-university.de/typo3conf/ext/dkd_fuas/Resources/Public/Images/logo.svg "Frankfurt University of Applied Science Logo")](https://www.frankfurt-university.de/){:width="200"}
+
+[![alt text](image "tooltip")](hyperlink)
+>>>>>>> 301a2b9d9b5cd5348d1ffae9cc7a25455819dc16
 
 LaTeX beamer theme “FrankfurtUniversity”
 ========================================