Skip to content

Commit

Permalink
build: disable build with glpi master
Browse files Browse the repository at this point in the history
Signed-off-by: Thierry Bugier <tbugier@teclib.com>
  • Loading branch information
btry committed Feb 19, 2019
1 parent ed4877f commit 286df68
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
- AFTER_SUCCESS_BRANCH=9.4/bugfixes
matrix:
- GLPI_BRANCH=9.4/bugfixes
- GLPI_BRANCH=master
# - GLPI_BRANCH=master

php:
- 5.6
Expand Down
1 change: 0 additions & 1 deletion inc/question.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@ public function showForm($ID, $options = []) {
echo '</td>';
echo '</tr>';


echo '<tr">';
echo '<td colspan="4">';
Dropdown::showFromArray('show_rule', [
Expand Down

0 comments on commit 286df68

Please sign in to comment.