fixed merge conflicts
authorJonathan Kawohl <john@owncloud.com>
Tue, 13 Dec 2016 08:12:50 +0000 (09:12 +0100)
committerJonathan Kawohl <john@owncloud.com>
Tue, 13 Dec 2016 08:12:50 +0000 (09:12 +0100)
commit5bae2ed5efcf291eba98d2ae70c268c5630983ca
tree5f7c320b21c0fa4ace31ac224304b5e86f306f9e
parent5af2a657ca8f07e2488d6d284ade0a579e2e000a
fixed merge conflicts
doc/building.rst