Skip to content

Commit 4168389

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # structure_threader/plotter/structplot.py
2 parents 53833f7 + 1a5eb15 commit 4168389

File tree

13 files changed

+169
-1560
lines changed

13 files changed

+169
-1560
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ target/
5656
# Eric6 project
5757
*.e4p
5858
.eric*
59+
60+
# Dolphin breadcrumbs
61+
*.directory

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ script:
1515
- tests/structure_field_test.sh
1616
- tests/fastStructure_field_test.sh
1717
- tests/maverick_field_test.sh
18+
19+
# Other stuff
20+
notifications:
21+
email:
22+
23+

0 commit comments

Comments
 (0)