gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source 
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>
This commit is contained in:
Piyush Vijay 2018-08-15 09:33:13 +05:30
parent 6a4496ee42
commit fd21247e53
No known key found for this signature in database
GPG Key ID: FC77A75558658D35
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/functions.js
View File

@ -1,4 +1,5 @@
import { AJAX } from './ajax';
import { $ } from './utils/JqueryExtended';
import CommonParams from './variables/common_params';
import { PMA_Messages as PMA_messages } from './variables/export_variables';

2
js/src/functions/Sql/SqlProfiling.js
View File

@ -1,5 +1,5 @@
import { createProfilingChart } from '../chart';
import { $ } from '../../utils/extend_jquery';
import { $ } from '../../utils/JqueryExtended';
import '../../plugins/jquery/jquery.tablesorter';
/*