-
Notifications
You must be signed in to change notification settings - Fork 8
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
2.1 local #2
Open
gpgreen
wants to merge
71
commits into
Open-MBEE:2.1
Choose a base branch
from
gpgreen:2.1-local
base: 2.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
2.1 local #2
Conversation
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
a Collection with a single item
…/mbee/util.git
…/mbee/util.git
…/mbee/util.git
different for different versions
LinkedHashMaps so that they need not be Comparable
versions in pom.xml.
https://[email protected]/mbee-dev/util.git Conflicts: src/gov/nasa/jpl/mbee/util/Timer.java
pom updated with SNAPSHOTs
Conflicts: build.xml src/gov/nasa/jpl/mbee/util/AbstractDiff.java src/gov/nasa/jpl/mbee/util/ClassUtils.java src/gov/nasa/jpl/mbee/util/Debug.java src/gov/nasa/jpl/mbee/util/HasId.java src/gov/nasa/jpl/mbee/util/Utils.java
Also merged with opensource branch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Added source/target to maven compilation plugin. Added packaging type so jar can be installed in local maven by "mvn install".