Skip to content

Commit 1bbac6e

Browse files
committed
fix: merge conflict code
1 parent 47c531b commit 1bbac6e

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

source/community.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,8 @@ Recorded sessions:
2525
Reporting bugs and issues
2626
*************************
2727

28-
You can report bugs and issues on GitHub:
29-
30-
<<<<<<< HEAD
3128
- You can report issues and bugs on the
3229
`Issues <https://github.com/nginx/unit-docs/issues>`_
33-
section of the Unit repo.
34-
=======
35-
NGINX Unit is released under the
36-
`Apache 2.0 license <https://github.com/nginx/unit/blob/master/LICENSE>`_;
37-
we maintain GitHub
38-
`repos <https://github.com/nginx>`_.
39-
>>>>>>> origin/main
4030

4131
- If you have found a fix or want to suggest a change to the code,
4232
you can open a `pull request <https://github.com/nginx/unit-docs/pulls>`_
@@ -55,7 +45,6 @@ Please report any security-related issues concerning Unit to
5545
For our mutual convenience, specifically mention **NGINX Unit** in the subject and follow the
5646
`CVSS v3.1 <https://www.first.org/cvss/v3.1/specification-document>`__.
5747

58-
5948
************
6049
Contributing
6150
************
@@ -71,7 +60,6 @@ If you are interested in contributing to the Unit documentation,
7160
or find a typo or an error in the docs, you can submit a pull request on the
7261
`unit-docs repo <https://github.com/nginx/unit-docs/pulls>`_.
7362

74-
7563
***********
7664
Source Code
7765
***********

0 commit comments

Comments
 (0)