-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add glyphicons to tabs on notes page #2306
Conversation
Generated by 🚫 Danger |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please remove the Gemfile.lock file ?
Great work. It looks good to me. Can you add a snapshot of what you are getting on your localhost? It will be very helpful for quick merge |
You don't need to remove the content of gemfile.lock rather , you need to remove your version of gemfile from this PR. If you need help I am happy to help with git. |
How do I go about that? I'll appreciate the help. |
Hi @AndyCodez , we need not remove the gemfile.lock file but just the changes related to it. A temporary fix is to copy the gemfile.lock of plots2/master and paste it in your project. When you push the changes, you should only see changes related to notes/index.html.erb on this pr. |
@ViditChitkara thanks! I did a reset then made the changes without checking my version of the Gemfile.lock into this pr. I however couldn't push to this remote branch so I deleted it and pushed my local branch again. I made another pr here #2316 |
No problems!! The changes look fantastic though!! |
Fixes #2299