kristjank/TeraHz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed broken git headers

Browse Source
This commit is contained in:
Kristjan Komlosi
2019-11-18 17:19:18 +01:00
parent 7837f605cf
commit bc72207187
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -34,8 +34,4 @@ More documentation is available at <https://terahz.readthedocs.io>
- Juš Dolžan (ANormalPerson) - Math double-checker
<img alt="TeraHz logo" src="http://www.sckr.si/documents/upload/konektor/logo/_SC.gif" width="200px">
<<<<<<< HEAD
TeraHz has been developed under guidance and financial support of Šolski Center Kranj (Kranj School Centre). Without their support, this project might have never been possible.
=======
TeraHz has been developed under guidance and financial support of Šolski Center Kranj (Kranj School Centre). Without their support, this project might have never been possible. As the project leader, I would like to personally thank prof. Darija Kramarič, who brought my idea to life; and Jože Drenovec, who provided me with everything needed for my experiments.
>>>>>>> 682fe20db291234c1ad2ff8ecb6c142c00220c32