Update ABOUT files - there's some merge cleanup

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

etc/scripts/irc-notify.py.ABOUT

@@ -14,22 +14,3 @@ licenses:
         url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:gpl-2.0
 notice_file: irc-notify.py.NOTICE
 owner: Christopher R. Wood
-<<<<<<< HEAD
-=======
-copyright: Copyright (C) 2015-2016 Christopher R. Wood
-license_expression: gpl-2.0-plus
-license_text_file: gpl-2.0.LICENSE
-notice_text: |
-    This program is free software; you can redistribute it and/or modify it under the
-    terms of the GNU General Public License as published by the Free Software
-    Foundation; either version 2 of the License, or (at your option) any later
-    version.
-    
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-    PARTICULAR PURPOSE. See the GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License along with this
-    program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-    Fifth Floor, Boston, MA 02110-1301 USA.
->>>>>>> branch 'v3-maintenance' of https://github.com/nexB/aboutcode-toolkit.git

thirdparty/bumpversion.ABOUT

@@ -1,16 +1,8 @@
 about_resource: bumpversion-0.5.4.dev0-py2.py3-none-any.whl
 name: bumpversion
 version: 0.5.4-dev (00d121468e7)
-<<<<<<< HEAD
 author:
     - Filip Noetzel
-=======
-home_url: https://github.com/peritus/bumpversion
-author: Filip Noetzel
-author_email: [email protected]
-license: MIT
-license_text_file: bumpversion.LICENSE
->>>>>>> branch 'v3-maintenance' of https://github.com/nexB/aboutcode-toolkit.git
 copyright: Copyright (C) 2013-2014 Filip Noetzel
 download_url: https://github.com/peritus/bumpversion/archive/00d121468e7e753b8c05f256ea0cfb759b805226.zip
 license_expression: mit