diff options
| author | jc0b <j@jc0b.computer> | 2020-06-30 16:30:27 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:43:50 +0200 |
| commit | 8133905047285b01c9ebaab43bfe4f6c86cf2623 (patch) | |
| tree | 671edebd731e1ce87382b2a0542ef3d3e89aa8a4 /simulator | |
| parent | 66b2d85385d05abb590535da60341876ecdbab71 (diff) | |
| parent | 8ede2b8597eb14c0567c2c3c0135593f7c557521 (diff) | |
Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration
Diffstat (limited to 'simulator')
| -rw-r--r-- | simulator/.editorconfig | 14 | ||||
| -rw-r--r-- | simulator/README.md | 2 | ||||
| -rw-r--r-- | simulator/misc/artwork/logo.png | bin | 2825 -> 0 bytes |
3 files changed, 1 insertions, 15 deletions
diff --git a/simulator/.editorconfig b/simulator/.editorconfig index 1cdb4ce2..a17544c9 100644 --- a/simulator/.editorconfig +++ b/simulator/.editorconfig @@ -1,20 +1,6 @@ # EditorConfig helps developers define and maintain consistent # coding styles between different editors and IDEs # editorconfig.org -root = true - -[*] -indent_style = space -indent_size = 4 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false -indent_style = space # ktlint [*.{kt, kts}] diff --git a/simulator/README.md b/simulator/README.md index 1bc866cf..84b40a54 100644 --- a/simulator/README.md +++ b/simulator/README.md @@ -1,6 +1,6 @@ <h1 align="center"> <a href="http://opendc.org/"> - <img src="misc/artwork/logo.png" width="100" alt="OpenDC"> + <img src="../misc/artwork/logo.png" width="100" alt="OpenDC"> </a> <br> OpenDC Simulator diff --git a/simulator/misc/artwork/logo.png b/simulator/misc/artwork/logo.png Binary files differdeleted file mode 100644 index d743038b..00000000 --- a/simulator/misc/artwork/logo.png +++ /dev/null |
