ChangeLog: Clean up from mid air collision

gcc/ChangeLog:

2017-07-06  Carl Love  <cel@us.ibm.com>

 	* ChangeLog: Clean up from mid air collision

gcc/testsuite/ChangeLog:

2017-07-06  Carl Love  <cel@us.ibm.com>

 	* ChangeLog: Clean up from mid air collision

From-SVN: r250024

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ac4c1cc05af5aec3678d741fee26e9faccf7614..647ca92b706b64ddc8ea91ae75167bd4430d1030 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-06  Carl Love  <cel@us.ibm.com>
+
+       * ChangeLog: Clean up from mid air collision
+
 2017-07-06  Carl Love  <cel@us.ibm.com>
 
        * config/rs6000/rs6000-c.c: Add support for built-in functions
@@ -51,7 +55,6 @@
        (linemap_client_expand_location_to_spelling_point): Add "aspect"
        param, and pass it to expand_location_1.
 
->>>>>>> .r250022
 2017-07-06  Sebastian Peryt  <sebastian.peryt@intel.com>
 
        * config/i386/avx512fintrin.h (_mm_mask_getexp_round_ss,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 46992f44b29970944f6e5109825986b55bf6a800..54e7bd231ef7a6340663998de1eb8c591092e537 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,6 @@
+2017-07-06  Carl Love  <cel@us.ibm.com>
+
+       * ChangeLog: Clean up from mid air collision
 
 2017-07-06  Carl Love  <cel@us.ibm.com>
 
@@ -27,7 +30,6 @@
        * gcc.dg/spellcheck-fields-2.c (test_macro): Update expected
        underlining within macro expansion.
 
->>>>>>> .r250022
 2017-07-06  Sebastian Peryt  <sebastian.peryt@intel.com>
 
        * gcc.target/i386/avx512f-vgetexpsd-1.c (_mm_mask_getexp_sd,