From 3843e80be1ce47de5fa07bfc9b447f087d41e156 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Tue, 30 Aug 2016 11:27:07 -0600
Subject: [PATCH] Enable jQuery noConflict (#160)

---
 CHANGELOG.md           | 4 ++++
 modules/jquery-cdn.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa76c84b..74a443a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### HEAD
+* Enable jQuery noConflict ([#160](https://github.com/roots/soil/issues/160))
+* Disable DNS Prefetch for WordPress Emoji (WP 4.6) ([#159](https://github.com/roots/soil/issues/159))
+
 ### 3.7.0: March 7th, 2016
 * Use `home_url` in `root_relative_url` ([#147](https://github.com/roots/soil/issues/147))
 * Add relative URLs to responsive images output ([#146](https://github.com/roots/soil/issues/146))
diff --git a/modules/jquery-cdn.php b/modules/jquery-cdn.php
index 40102db7..dcc24061 100644
--- a/modules/jquery-cdn.php
+++ b/modules/jquery-cdn.php
@@ -34,7 +34,7 @@ function jquery_local_fallback($src, $handle = null) {
   static $add_jquery_fallback = false;
 
   if ($add_jquery_fallback) {
-    echo '<script>window.jQuery || document.write(\'<script src="' . $add_jquery_fallback .'"><\/script>\')</script>' . "\n";
+    echo '<script>(window.jQuery && jQuery.noConflict()) || document.write(\'<script src="' . $add_jquery_fallback .'"><\/script>\')</script>' . "\n";
     $add_jquery_fallback = false;
   }