Merge remote-tracking branch 'origin/subliminal_patch' into subliminal_patch

6 years ago · 1e74036db4
parent 9fe6e8595e a5d547556b
commit 1e74036db4
1 changed files with 0 additions and 15 deletions
--- a/views/settings.tpl
+++ b/views/settings.tpl
@ -1462,21 +1462,6 @@
                        </div>
                        <div class="middle aligned row">
                            <div class="right aligned four wide column">
                                <label>Shooter</label>
                            </div>
                            <div class="one wide column">
                                <div id="shooter" class="ui toggle checkbox provider">
                                    <input type="checkbox">
                                    <label></label>
                                </div>
                            </div>
                        </div>
                        <div id="shooter_option" class="ui grid container">
                        </div>
                        <div class="middle aligned row">
                            <div class="right aligned four wide column">
                                <label>Subscene</label>