Conflict fixed
Dieser Commit ist enthalten in:
Ursprung
54fd2aadd0
Commit
18ffa5520d
1 geänderte Dateien mit 0 neuen und 7 gelöschten Zeilen
|
@ -1,16 +1,9 @@
|
||||||
When a problem occurs, then always for a reason! What you want to do in such a case is:
|
When a problem occurs, then always for a reason! What you want to do in such a case is:
|
||||||
|
|
||||||
1. Read your logs; follow them to see what the reason for your problem is.
|
1. Read your logs; follow them to see what the reason for your problem is.
|
||||||
<<<<<<< HEAD
|
|
||||||
2. Follow the leads given to you in your logfiles and start investigating.
|
2. Follow the leads given to you in your logfiles and start investigating.
|
||||||
3. Restarting the troubled service or the whole stack to see if the problem persists.
|
3. Restarting the troubled service or the whole stack to see if the problem persists.
|
||||||
4. Read the documentation of the troubled service and search it's bugtracker for your problem.
|
4. Read the documentation of the troubled service and search it's bugtracker for your problem.
|
||||||
5. Search our [issues](https://github.com/mailcow/mailcow-dockerized/issues) for your problem.
|
5. Search our [issues](https://github.com/mailcow/mailcow-dockerized/issues) for your problem.
|
||||||
=======
|
|
||||||
2. Follow the leads given to you in your log files and start investigating.
|
|
||||||
3. Restart the troubled service or the whole stack to see if the problem persists.
|
|
||||||
4. Read the documentation of the troubled service and search it's bug tracker for your problem.
|
|
||||||
5. Search our [issues](https://github.com/mailcow/mailcow-dockerized/issues) <!-- and [forum](https://forum.mailcow.email/) --> for topics related to your problem.
|
|
||||||
>>>>>>> 2ef7ae0f89cf3f9e8c7a73c99449cc50215450d7
|
|
||||||
6. [Create an issue](https://github.com/mailcow/mailcow-dockerized/issues) over at our GitHub repository if you think your problem might be a bug or a missing feature you badly need. But please make sure, that you include **all the logs** and a full description to your problem.
|
6. [Create an issue](https://github.com/mailcow/mailcow-dockerized/issues) over at our GitHub repository if you think your problem might be a bug or a missing feature you badly need. But please make sure, that you include **all the logs** and a full description to your problem.
|
||||||
8. Connect to IRC ([chat.freenode.net](https://webchat.freenode.net/)) and join our IRC channel [#mailcow](irc://chat.freenode.net:6667/mailcow).
|
8. Connect to IRC ([chat.freenode.net](https://webchat.freenode.net/)) and join our IRC channel [#mailcow](irc://chat.freenode.net:6667/mailcow).
|
||||||
|
|
Laden …
In neuem Issue referenzieren