aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLéo Gourdin <leo.gourdin@univ-grenoble-alpes.fr>2021-05-28 12:38:05 +0200
committerLéo Gourdin <leo.gourdin@univ-grenoble-alpes.fr>2021-05-28 12:38:05 +0200
commit8752cea89f862d92d49183fe10d1918588143ab1 (patch)
tree2e947a22395702b741c8fac14c7d89ac419c4b5b /Makefile
parentef5775ea869701eb04c873174c362b314166bf06 (diff)
downloadcompcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.tar.gz
compcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.zip
fix some merge errors
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions