gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-06 21:29:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2019-03-18 06:55:02 +01:00
parent d5109326f2
commit b953ead796
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/README.Dist-Layout
View File

@ -78,14 +78,7 @@ In order to convert to this layout you need to do the following in the seeddms51
directory (replace seeddms-5.1.x with you installed version of seeddms): directory (replace seeddms-5.1.x with you installed version of seeddms):
ln -s seeddms-5.1.x seeddms ln -s seeddms-5.1.x seeddms
<<<<<<< HEAD
mv seeddms-5.1.x/conf .
rm www
mkdir www
mv seeddms-5.1.x/ext www
=======
mv www/conf . mv www/conf .
>>>>>>> seeddms-5.1.x
cd www cd www
rm inc op out views controllers styles languages webdav restapi pdfviewer index.php rm inc op out views controllers styles languages webdav restapi pdfviewer index.php
ln -s ../seeddms/inc ln -s ../seeddms/inc