[FIX CONFLICTS] Merge env. fallbacks to 1.2 #328
Merged
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
Collaborator
sacOO7
commented
May 26, 2021
•
sacOO7
commented
- Previous env. fallbacks PR was merged to main, so it's throwing conflicts
- Current PR aims to fix MERGE CONFLICTS from INTEGRATION 1.2 TO MAIN
re-formatted code using goimport
updated tests for the same
…nv-fallbacks # Conflicts: # .gitignore # ably/ably_test.go # ably/export_test.go # ably/options.go # ably/realtime_client.go # ably/rest_client.go
sacOO7
changed the title
sacOO7
commented
May 26, 2021
# Conflicts: # ably/options.go # ably/rest_client.go
lmars
approved these changes
May 27, 2021
Sync with integration 1.2
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.