Commit e4b2a85
committed
Merge branch 'develop' into hotfix/0.1.1
* develop:
[edit] Add an import statement to code in README.md
[change] Remove main from src/multi_svr.py
[change] Change --source from tests to src in coverage in .travis.yml
[change] Change .travis and setup.py
[change] Change test_suite in setup.py from 'tests' to 'multi_svr_test.suite'
[change] Add "--source=multi_svr_test" to coverage in .travis.yml
[fix] Remove --source from coverage in .travis.yml
[edit] Add missing '>' to README.md
# Conflicts:
# multi_svr/__init__.py3 files changed
+4
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
47 | | - | |
| 49 | + | |
48 | 50 | | |
49 | 51 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
0 commit comments