Remove rebase cruft.

This commit is contained in:
Paul Chote
2013-07-21 20:41:04 +12:00
parent 0594822078
commit cff5b8bfb0

View File

@@ -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