wait for a working of new daemon

fa5c3cd7 · nanahira · 4d572980 · fa5c3cd7
Commit fa5c3cd7 authored Dec 28, 2020 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

ansible/bird.conf.j2 ansible/bird.conf.j2 +0 -5

No files found.
--- a/ansible/bird.conf.j2
+++ b/ansible/bird.conf.j2
@@ -9,15 +9,10 @@ protocol device {}
 protocol kernel {
  learn;
  ipv4 {
-<<<<<<< HEAD
    import where net = 0.0.0.0/0;
    export where net != 0.0.0.0/0;
  };
  #ipv6 { export all; };
-=======
-    import all;
-  };
->>>>>>> master
 }