Merge branch 'master' of https://github.com/mar10/jquery-contextmenu.git

mar10 · mar10 · commit d25f0cf15257 · 2013-03-21T19:58:05.000+01:00
Conflicts:
	.gitignore
	README.md
	sample-widget.html
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 /.settings
 /.project
+<<<<<<< HEAD
 /node_modules
+=======
+>>>>>>> branch 'master' of https://github.com/mar10/jquery-contextmenu.git
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-#jquery-contextmenu
+# jquery-contextmenu
 
 A jQuery plugin that provides a context menu (based on the standard [jQueryUI menu] widget).
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#jquery-contextmenu`
	`1`	`+# jquery-contextmenu`
`2`	`2`
`3`	`3`	`A jQuery plugin that provides a context menu (based on the standard [jQueryUI menu] widget).`
`4`	`4`