2 commits

Author	SHA1	Message	Date
Deepak Agrawal	ccf2d9c8cc	conflict res after patching	2018-06-18 11:18:27 -07:00
Deepak Agrawal	ef577b71cc	Handling of configurations blocks with end-* at the end of the block (#39673) ... * handle end-policy issue * revert changes in iosxr cliconf * fix trailing parents not included in difference * Moving fix to platform specific fix * pep 8 issues	2018-05-08 10:02:50 +05:30