Remove rebase cruft.
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
* available to you under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation. For more information,
|
||||
* see COPYING.
|
||||
<<<<<<< HEAD
|
||||
*/
|
||||
#endregion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user