aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAndrew Rylatt <andrew@rylatt.me>2016-07-30 18:08:08 +0000
committerAndrew Rylatt <andrew@rylatt.me>2016-07-30 18:08:08 +0000
commite3a320650af37bb94b4d784013627a33b44085a6 (patch)
tree3f67328dd0240a23ba16e5a687ab950690b47607 /Makefile
parentAdd DirectoryLister (diff)
parentMerge pull request #632 from SitoCH/master (diff)
downloadawesome-selfhosted-e3a320650af37bb94b4d784013627a33b44085a6.tar.gz
awesome-selfhosted-e3a320650af37bb94b4d784013627a33b44085a6.zip
Fix DirectoryLister merge conflict
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions