mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-02-01 23:24:10 +01:00
Fix merge.
This commit is contained in:
parent
990b911c06
commit
657b76d174
@ -2,7 +2,6 @@
|
||||
# Copyright (c) 2002-2009, Jeremiah Fincher
|
||||
# Copyright (c) 2011, Valentin Lorentz
|
||||
# Copyright (c) 2009,2013, James McCoy
|
||||
>>>>>>> supybot/master
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
Loading…
Reference in New Issue
Block a user