Open
Conversation
Resolved Conflicts in: MarkdownLive.xcodeproj/project.pbxproj
This file is generated automatically by the makefile. It would be better if this were automated.
Added README and update.sh to the project so that the fake sunmodule nature of the discount folder is clear.
Removed superfluous build script from project. Removed the pre-existant copy of block tags.
Updated the discount-config README accordingly.
… bit debug builds do not get broken when importing project as a sub-project or into a workspace.
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
2 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.
discount now generates a block tags file via a make target. This has been incorporated into update.sh
Added update-discount.sh to automate the updating.