diff options
Diffstat (limited to 'HACKING.pending')
| -rw-r--r-- | HACKING.pending | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/HACKING.pending b/HACKING.pending index 25ea0bd4..80c8cb45 100644 --- a/HACKING.pending +++ b/HACKING.pending @@ -28,7 +28,11 @@ the list have been stored. Tom Henderson of Boeing has created a repository to work on multi-topology routing support for OSPF. Work on this repository +<<<<<<< HEAD takes place on the branch mtr, which has a branch poing of 0.99.17 +======= +takes place on the branch mtr, which has a branch point of 0.99.17 +>>>>>>> 538cb284864c17de66152a5236db4cd80e3e7639 * posted patches |