fix conflict

Browse Source

...

This commit is contained in:

mahdi purHosseini

2023-09-17 13:48:58 +03:30

parent 7a3fd3a13f

commit e07f983327

3 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

public/js/show/app.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long