pull request spel 2019.05.1 #299
Merged
Conversation
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
lorengordon
requested changes
May 22, 2019
|
Fixed package list |
lorengordon
reviewed
May 22, 2019
confusdcodr
reviewed
May 22, 2019
|
Thanks, I fixed that
…On Wed, May 22, 2019 at 1:40 PM Gregory O. ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In CHANGELOG.md
<#299 (comment)>:
> @@ -10,7 +10,8 @@
**Summary**:
* "Extra" package updates
- - aws-cli/1.16.140 Python/2.7.5 Linux/3.10.0-862.14.4.el7.x86_64 botocore/1.12.130
+<<<<<<< HEAD
You seem to have inserted a merge conflict that wasn't resolved
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#299?email_source=notifications&email_token=AGHDCHP3JAPK6A3OK3BEML3PWWAQPA5CNFSM4HOQI5X2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOBZNAJTY#pullrequestreview-240780495>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AGHDCHOT7LOO6L7IPRNB7ATPWWAQPANCNFSM4HOQI5XQ>
.
--
Nick Ortiz
571-239-7930 | nicholas.ortiz@plus3it.com
https://plus3it.com
[image: MCSE: Cloud Platform and Infrastructure — Certified 2018]
--
*This e-mail and any attachments are intended only for the use
of the addressee(s) named herein and may contain proprietary information.
If you are not the intended recipient of this e-mail or believe that you
received this email in error, please take immediate action to notify the
sender of the apparent error by reply e-mail; permanently delete the e-mail
and any attachments from your computer; and do not disseminate, distribute,
use, or copy this message and any attachments.*
|
confusdcodr
reviewed
May 22, 2019
1677734 to
2f4c8f9
Compare
lorengordon
approved these changes
May 22, 2019
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.
Fixes # .
Changes offered/proposed in this pull request: