3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-28 05:59:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

docs/docs: remove extra text when resolve conflict (#955)

Browse source
This commit is contained in:
Cuong Manh Le 2020-06-22 10:38:31 +07:00 • committed by GitHub
parent 8d0deb0732
commit 5b9c09caba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/docs/upgrading.md
View file

@ -38,7 +38,6 @@ In `0.9.0`:
option httpchk GET /ping HTTP/1.1\r\nHost:pomerium
```
>>>>>>> c29807c3915b2e61d1a53dd007a8871b6494c3c6
# Since 0.8.0