Fix license header
This commit is contained in:
parent
6e4db2c305
commit
24b92172be
|
@ -1,8 +1,5 @@
|
|||
/*
|
||||
<<<<<<< HEAD
|
||||
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||
=======
|
||||
>>>>>>> development
|
||||
* Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
Loading…
Reference in a new issue