diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 11:30:17 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 12:12:32 +0100 |
commit | 3d1092eab0f4a5c771225c78072a7b6eccb82849 (patch) | |
tree | 2b1603e5a0aa1e7e42f4bb9bbcac73bfac46e63d /docs | |
parent | d76bb3c179b7a32b109e39aa87ff09c8f5a8c178 (diff) |
Major cleanup of all leftovers after rebasing on master.
The patching of elogind in several steps with only partly rebasing on
a common commit with upstream, left the tree in a state, that was
unmergeable with master. By rebasing on master and manually cleaning
up all commits, this merge is now possible.
However, this process left some orphans, that are cleanup now.
Diffstat (limited to 'docs')
l--------- | docs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/Makefile b/docs/Makefile new file mode 120000 index 000000000..bd1047548 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1 @@ +../src/Makefile
\ No newline at end of file |