summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTristan Sloughter <tristan.sloughter@gmail.com>2015-03-16 13:05:13 -0500
committerTristan Sloughter <tristan.sloughter@gmail.com>2015-03-16 13:05:13 -0500
commitfb6151b524c0c43957d01c5fa8ba3d42044e2d1d (patch)
treebab5dfbf7fd01205497f182ac398352bd8912efa /Makefile
parent9d4ed68620b52d5b96e4bc3c4ebc8735a5df2782 (diff)
parentf35f26fece0bc3843bd4dba9244ae974fd84d9e1 (diff)
Merge pull request #269 from ferd/dep-conflict-as-error
Dep conflict as error
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions