Updated and added Airframes#27
Open
Marsychen wants to merge 2 commits intoobfuscoder:masterfrom
Marsychen:master
Open
Updated and added Airframes#27Marsychen wants to merge 2 commits intoobfuscoder:masterfrom Marsychen:master
Marsychen wants to merge 2 commits intoobfuscoder:masterfrom
Marsychen:master
Conversation
Updated Airframes: JF-17, AV-8B, F-14B, M-2000C, F-5E, E-3A, UH-1H, KA-50, Mi-8, KC-135, KC-135MPRS Added Airfames KC-130, E-2D, C-101CC, C-101EB, F-14B, L-39ZA, L-39C, SA342L, SA342M, SA342Minigun, SA342Mistral Removed Airfames (due to added Airframes) F-14, C-101, L-39
obfuscoder
requested changes
Aug 1, 2020
sa342m was used twice. Changed to sa342m and sa342mistral
Contributor
Author
|
wirst du das irgendwann noch mergen? |
Owner
|
Merge request has conflicts. They should be resolved before I can merge. Has the change request been incorporated? |
Contributor
Author
|
All Changed requestest has been incoporated by 2nd of August, you never merged the file though. |
obfuscoder
requested changes
Dec 8, 2020
Owner
obfuscoder
left a comment
obfuscoder
left a comment
There was a problem hiding this comment.
Please resolve merge conflict as well
Contributor
Author
|
I don't see any conflicts... please advise |
Owner
|
You need to rebase your work on the current master branch or merge the current master branch into yours. Then you will get a conflict notice in your client which you can solve then. |
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.
Updated Airframes:
JF-17, AV-8B, F-14B, M-2000C, F-5E, E-3A, UH-1H, KA-50, Mi-8, KC-135, KC-135MPRS
Added Airfames
KC-130, E-2D, C-101CC, C-101EB, F-14B, L-39ZA, L-39C, SA342L, SA342M, SA342Minigun, SA342Mistral
Removed Airfames (due to added Airframes)
F-14, C-101, L-39