summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-24 18:25:45 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-24 18:25:45 +0100
commitc4f7a15d6480e450ed19f3aa94dc3a12b69f06c4 (patch)
treeff3f3f7916c38cb30365e24125f022988db225e1 /Makefile
parent4cdd86ecb8a474fde41352744392c14bd686a4ad (diff)
downloadkernel-c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4.tar.gz
kernel-c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4.tar.xz
kernel-c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4.zip
Revert "fix a file conflict"
This reverts commit 4cdd86ecb8a474fde41352744392c14bd686a4ad.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions