fix readme
This commit is contained in:
parent
5524c721d0
commit
6fb86f7e61
|
@ -1,12 +1,6 @@
|
||||||
# thesis_server
|
# thesis_server
|
||||||
|
|
||||||
Serverside stuff for thesis project.
|
Serverside stuff for thesis project.
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
Components for web app and helper scripts.
|
|
||||||
|
|
||||||
Some parts of the code may be licensed under a different license.
|
|
||||||
=======
|
|
||||||
Some components are under a different license.
|
Some components are under a different license.
|
||||||
|
|
||||||
### webapp
|
### webapp
|
||||||
|
@ -16,4 +10,3 @@ Files for a flask webapp to visualise data from database.
|
||||||
### scripts
|
### scripts
|
||||||
|
|
||||||
Helper scripts.
|
Helper scripts.
|
||||||
>>>>>>> master
|
|
||||||
|
|
Loading…
Reference in New Issue