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

Merge branch 'master' of github.com:cls-02/TeraHz

Browse Source
This commit is contained in:
Kristjan Komlosi
2019-11-17 22:23:28 +01:00
parent 3d1a925ba6 682fe20db2
commit 7837f605cf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -34,4 +34,8 @@ More documentation is available at <https://terahz.readthedocs.io>
- Juš Dolžan (ANormalPerson) - Math double-checker - Juš Dolžan (ANormalPerson) - Math double-checker
<img alt="TeraHz logo" src="http://www.sckr.si/documents/upload/konektor/logo/_SC.gif" width="200px"> <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.
=======
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