Created
October 8, 2014 20:18
-
-
Save darkwing/d12c1fef59f30cc94c54 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<<<<<<< HEAD | |
$("#id_profile-expertise").hide().after("<ul id='tags-expertise' class='tags'></ul>"); | |
======= | |
$('#id_profile-expertise').hide().after('<ul id="tags-expertise" class="taglist"></ul>'); | |
>>>>>>> ba3903b... bug 1055078 - Make profile.js pass jshint |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment