Merge branch 'master' of z:/git/glDatePicker

Conflicts: README.md
glad · Aug 1, 2011 · a54a774 · a54a774
2 parents 982ab61 + 26b000a
commit a54a774
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,10 @@ Make sure you have a textbox that you can tie the plugin to:
     <input type="text" id="date" />
 
 Finally bind the plugin to the input textbox and set any options you want:
+<<<<<<< HEAD
 
+=======
+>>>>>>> 26b000a7a4ce346be5cab263fed08e7e6ddb68ca
     $("#date").glDatePicker(
     {
         allowOld: false,