Merge branch 'siv/develop' into release_23

SCADA-LTS · Jul 3, 2020 · 45f8017 · 45f8017
2 parents 482ea1d + 6656ef8
commit 45f8017
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,8 +34,6 @@ branches:
   only:
   - "/^siv/develop.*$/"
   - "/^siv/master.*$/"
-  - "/^feature/#1183.*$/"
-  - "/^feature_s/#1165.*$/"
   - "/^f_1165_1183/#1198.*$/"
 notifications:
   email: false