From fd21247e53efa3b737ac6bc6c2be5cb768294382 Mon Sep 17 00:00:00 2001
From: Piyush Vijay <piyushvijay.1997@gmail.com>
Date: Wed, 15 Aug 2018 09:33:13 +0530
Subject: [PATCH] Resolve merge conflicts Signed-Off-By: Piyush Vijay
 <piyushvijay.1997@gmail.com>

---
 js/src/functions.js                  | 1 +
 js/src/functions/Sql/SqlProfiling.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/functions.js b/js/src/functions.js
index 2699a6364d..798272e516 100644
--- a/js/src/functions.js
+++ b/js/src/functions.js
@@ -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';
 
diff --git a/js/src/functions/Sql/SqlProfiling.js b/js/src/functions/Sql/SqlProfiling.js
index d2420c8d8d..fedb00716f 100644
--- a/js/src/functions/Sql/SqlProfiling.js
+++ b/js/src/functions/Sql/SqlProfiling.js
@@ -1,5 +1,5 @@
 import { createProfilingChart } from '../chart';
-import { $ } from '../../utils/extend_jquery';
+import { $ } from '../../utils/JqueryExtended';
 import '../../plugins/jquery/jquery.tablesorter';
 
 /*