tgreer

Will see what I can do. No promises.

git merge origin/upstream Auto-merging share/Makefile.in CONFLICT (content): Merge conflict in share/Makefile.in Auto-merging share/Makefile.am Auto-merging missing CONFLICT (content): Merge conflict in missing Removing man/xrrancid.1 Auto-merging man/router.db.5 Auto-merging man/rancid_intro.1 CONFLICT (content): Merge...

I preferred your way > On 18 Mar 2015, at 22:25, Matthew Walster [email protected] wrote: > > Ok, we have a bit of a problem. > > 3.2 has been...