Don't enable Apache site if native nginx support exists #2141
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
jvonau
force-pushed
the
restarts
branch
3 times, most recently
from
15f2fc2
to
7f954fa
Compare
holta
reviewed
Jan 13, 2020
Closed
Closed
|
@jvonau's listing @ #2078 (comment) also very helpful to understanding & evolving https://github.com/iiab/iiab/blob/master/roles/nginx/README.md over the coming days/weeks! |
|
So why can't I use the web interface to resolve conflicts like I was able to do in other PRs? |
It's happened to me too, for certain very simple merge conflicts. Very annoying. |
|
I see why, files were renamed in 2166. |
|
superseded by #2189 |
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.
without proxy_pass to Apache