Skip to content
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

Removes duplicate M24 lines to fix error #24774

Merged
merged 1 commit into from Aug 11, 2018

Conversation

Projects
None yet
2 participants
@DracoGriffin
Copy link
Member

commented Aug 11, 2018

Fixes #24769
by removing these duplicate lines:

"reload_noise_volume": 10, "skill":"rifle",

Due to using "copy-from" improperly, as they are already inherited from both:

"abstract": "rifle_base", for rifle skill
and
"abstract": "gun_base", for reload noise volume.

Removes duplicate "copy-from" lines
Fixes issue #24769 by removing these duplicate lines when using "copy-from" improperly.

@ZhilkinSerg ZhilkinSerg merged commit 6f6d4d1 into CleverRaven:master Aug 11, 2018

3 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage decreased (-0.02%) to 23.639%
Details
gorgon-ghprb Build finished.
Details

@DracoGriffin DracoGriffin deleted the DracoGriffin:fix_M24_notupdated branch Aug 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.