fix rebase conflicts

This commit is contained in:
Megamouse 2020-12-22 00:16:09 +01:00
parent 36189b8c3b
commit 7c7af2e102
3 changed files with 6 additions and 3 deletions

View file

@ -1,4 +1,4 @@
// Copyright (C) 2014 Hykem <hykem@hotmail.com>
// Copyright (C) 2014 Hykem <hykem@hotmail.com>
// Licensed under the terms of the GNU GPL, version 3
// http://www.gnu.org/licenses/gpl-3.0.txt