mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-05 14:37:08 +00:00
fix rebase conflicts
This commit is contained in:
parent
36189b8c3b
commit
7c7af2e102
3 changed files with 6 additions and 3 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue