Removes leftover submodule directory, which can cause conflicts when updating to latest.#42
Open
Yggdrasil wants to merge 20 commits intoperitor:masterfrom
Yggdrasil:master
Open
Removes leftover submodule directory, which can cause conflicts when updating to latest.#42Yggdrasil wants to merge 20 commits intoperitor:masterfrom Yggdrasil:master
Yggdrasil wants to merge 20 commits intoperitor:masterfrom
Yggdrasil:master
Conversation
… This version seems to work for us. Remove Rake namespace fix because it breaks the app when upgrading from Rake 0.9 to Rake 10 and seems to be obsolete.
… to 'star' commonly used projects which will be displayed in the top of the menu.
…datatype to an integerZ
Add Favorite Projects flag and display favorites in a menu block.
…k. Add rdoc gem to bundle.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit removes a leftover submodule directory, for the exception notifier plugin, which was removed in commit 529d6ae.
Having this empty submodule dir caused a conflict for me when updating to latest. Git didn't seem to understand how to deal with it.