Skip to content
Snippets Groups Projects
Commit 47f03bce authored by Jakub Štercl's avatar Jakub Štercl
Browse files

Merge remote-tracking branch 'origin/master'

parents 60ba8f59 55df8d8a
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
### ..C++ stuff, that i think shouldn't be in the repo ### ..C++ stuff, that i think shouldn't be in the repo
*.cpp *.cpp
*.h *.h
###qt project
*.user
   
# database # database
database.db database.db
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment