howto/Bird.md
... ...
@@ -318,12 +318,9 @@ function is_valid_network() {
318 318
```
319 319
320 320
# Bird communities
321
-<<<<<<< HEAD
322
-Communities can be used to prioritize traffic based on different flags, in DN42 we are using communities to prioritize based on latency, bandwidth and encryption. More information can be found [here](/howto/Bird-communities).
323
-=======
321
+
324 322
Communities can be used to prioritize traffic based on different flags, in DN42 we are using communities to prioritize based on latency, bandwidth and encryption. It is really easy to get started with communities and we encourage all of you to get the basic configuration done and to mark your peerings with the correct flags for improved routing.
325 323
More information can be found [here](/howto/Bird-communities).
326
->>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d
327 324
328 325
# Useful bird commmands
329 326