Fix annobin merge unresolved conflicts 84/210884/1 sandbox/mkashkarov/test-fix
authorMikhail Kashkarov <m.kashkarov@partner.samsung.com>
Thu, 25 Jul 2019 18:14:24 +0000 (21:14 +0300)
committerMikhail Kashkarov <m.kashkarov@partner.samsung.com>
Thu, 25 Jul 2019 18:20:24 +0000 (21:20 +0300)
commit01baebcf2719b6e9f67b91f4856a4875fb2f2852
treeadc6e83568e8d11c8aa84f88aa314a0f2d11790f
parent14d5c9218c5023638e222d167e35a5d40b04fc5c
Fix annobin merge unresolved conflicts

Change-Id: If4169ae791fa6f3cdc1dec358cfdde80a2ae7b96
gcc/annobin.c
gcc/annobin.h
gcc/cp/decl.c