From 91f3daed99b57c900b0b9008d68bb15da271bd8b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 15 Mar 2014 12:19:28 -0400
Subject: [PATCH] Remove unused file

---
 js/jquery.conflict.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 js/jquery.conflict.js

diff --git a/js/jquery.conflict.js b/js/jquery.conflict.js
deleted file mode 100644
index 7790e15da3..0000000000
--- a/js/jquery.conflict.js
+++ /dev/null
@@ -1 +0,0 @@
-var cj = jQuery.noConflict(); $ = cj;
-- 
2.25.1