Skip to content

Commit

Permalink
Merge remote branch 'origin/master' into stage-055-docs-v2 to fetch c…
Browse files Browse the repository at this point in the history
…hanges

from it. Resolve conflicts in code and remake the docs.

Conflicts:
	Docs/build/html/_modules/index.html
	Docs/build/html/_modules/pyDKB/dataflow/communication/messages.html
	Docs/build/html/_modules/pyDKB/dataflow/stage/AbstractProcessorStage.html
	Docs/build/html/_modules/pyDKB/dataflow/stage/processors.html
	Docs/build/html/genindex.html
	Docs/build/html/objects.inv
	Docs/build/html/pyDKB/pyDKB.dataflow.messages.html
	Docs/build/html/pyDKB/pyDKB.dataflow.stage.AbstractProcessorStage.html
	Docs/build/html/pyDKB/pyDKB.dataflow.stage.processors.html
	Docs/build/html/pyDKB/pyDKB.dataflow.types.html
	Docs/build/html/searchindex.js
	Docs/build/pdf/DKB.pdf
	Utils/Dataflow/016_task2es/input
	Utils/Dataflow/055_documents2TTL/documents2ttl.py
  • Loading branch information
Evildoor committed Nov 12, 2019
2 parents c8f755e + 39b8013 commit 9d6767d
Show file tree
Hide file tree
Showing 707 changed files with 20,153 additions and 53,051 deletions.
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,18 @@ jobs:
echo "$errors"
false
fi
- stage: README_checks
language: minimal
name: "Line length"
script: Tests/travis/README_long_lines.sh

- stage: README_checks
language: minimal
name: "Tabs"
script: Tests/travis/README_tabs.sh

- stage: README_checks
language: minimal
name: "Trailing spaces"
script: Tests/travis/README_trailing_spaces.sh
90 changes: 0 additions & 90 deletions DKBFrontEnd/deployment/README

This file was deleted.

14 changes: 0 additions & 14 deletions DKBFrontEnd/deployment/apache-dkb.conf

This file was deleted.

111 changes: 0 additions & 111 deletions DKBFrontEnd/deployment/install.sh

This file was deleted.

20 changes: 0 additions & 20 deletions DKBFrontEnd/src/.editorconfig

This file was deleted.

10 changes: 0 additions & 10 deletions DKBFrontEnd/src/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions DKBFrontEnd/src/.npmignore

This file was deleted.

4 changes: 0 additions & 4 deletions DKBFrontEnd/src/.travis.yml

This file was deleted.

Loading

0 comments on commit 9d6767d

Please sign in to comment.