oops: Fix several merge conflict crashes
Showing
- include/class.i18n.php 1 addition, 0 deletionsinclude/class.i18n.php
- include/class.ticket.php 1 addition, 1 deletioninclude/class.ticket.php
- include/i18n/en_US/role.yaml 4 additions, 3 deletionsinclude/i18n/en_US/role.yaml
- include/staff/templates/thread-entries.tmpl.php 1 addition, 1 deletioninclude/staff/templates/thread-entries.tmpl.php
- include/staff/templates/thread-entry.tmpl.php 29 additions, 29 deletionsinclude/staff/templates/thread-entry.tmpl.php
- include/staff/ticket-view.inc.php 4 additions, 4 deletionsinclude/staff/ticket-view.inc.php
- include/upgrader/streams/core.sig 1 addition, 1 deletioninclude/upgrader/streams/core.sig
- include/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql 0 additions, 0 deletionsinclude/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql
- include/upgrader/streams/core/9143a511-0d6099a6.patch.sql 3 additions, 3 deletionsinclude/upgrader/streams/core/9143a511-0d6099a6.patch.sql
- scp/css/scp.css 5 additions, 9 deletionsscp/css/scp.css
- setup/inc/streams/core/install-mysql.sql 2 additions, 3 deletionssetup/inc/streams/core/install-mysql.sql
Loading
Please register or sign in to comment