[ixpmanager] Issues Running updates

[Levi Pederson]

All,

I'm following the process here.

http://docs.ixpmanager.org/install/upgrading/

And I've received an error saying, I've modified the bower.json file.   A
file that I am unaware that I changed.

git pull
Updating aa14e99..b3528d0
error: Your local changes to the following files would be overwritten by
merge:
        bower.json
Please, commit your changes or stash them before you can merge.
Aborting

Does anyone have a recommendation?

My install was based on the V4 script several months ago.

Thank you in advance,

*Levi Pederson*
Mankato Networks LLC
cell | 612.481.0769
work | 612.787.7392
levipederson at mankatonetworks.net
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.inex.ie/pipermail/ixpmanager/attachments/20170630/3b1f2f72/attachment.html>