diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
| commit | 5f7b30cd766d3589a00750d6100f718347d8f495 (patch) | |
| tree | d97cb6934284dc98def18ae7daaa819acc2d50ed /Documentation/sphinx | |
| parent | c1ece76719205690f4b448460d9b85c130e8021b (diff) | |
| parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) | |
| download | lwn-docs-next-merge.tar.gz lwn-docs-next-merge.zip | |
Merge branch 'docs-next' into docs-next-mergedocs-next-merge
Fix the Makefile merge conflict.
Diffstat (limited to 'Documentation/sphinx')
0 files changed, 0 insertions, 0 deletions