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 2007,2008,2010 Segher Boessenkool <segher@kernel.crashing.org>
// Copyright 2007,2008,2010 Segher Boessenkool <segher@kernel.crashing.org>
// Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt