From: John Resig <jeresig@gmail.com>
Date: Sat, 20 Oct 2007 22:08:03 +0000 (+0000)
Subject: Spelling mistake.
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=98204c7f6022958f277a7ea3bb8eacdc369753a4;p=jquery.git

Spelling mistake.
---

diff --git a/test/index.html b/test/index.html
index 00ca904..9f91f88 100644
--- a/test/index.html
+++ b/test/index.html
@@ -4,7 +4,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>jQuery Test Suite</title>
 	<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
-	<script>var jQuery = "jQuery", $ = "$"; // For testing .noConflcit()</script>
+	<script>var jQuery = "jQuery", $ = "$"; // For testing .noConflict()</script>
 	<script type="text/javascript" src="../dist/jquery.js"></script>
 	<script type="text/javascript" src="data/testrunner.js"></script>
 	<script type="text/javascript" src="unit/core.js"></script>