diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-18 03:01:56 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-18 03:01:56 +0100 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /pimd/pim_oil.c | |
| parent | pimd: make the json output a bit more machine-friendly (diff) | |
| parent | Merge pull request #82 from opensourcerouting/queue/ldp-xml2cli-build (diff) | |
| download | frr-b58ed1f8a89ea32c2380bf79057e5333109d72d4.tar.xz frr-b58ed1f8a89ea32c2380bf79057e5333109d72d4.zip | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'pimd/pim_oil.c')
| -rw-r--r-- | pimd/pim_oil.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index aa059797d..1c0a2f2be 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -16,7 +16,10 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +<<<<<<< HEAD +======= +>>>>>>> origin/master */ #include <zebra.h> |