<div dir="ltr">Barry,<div><br></div><div>As always thank you for the prompt and informative responses. Forgive the interruption.</div><div><br></div><div>Thank you,</div><div><br></div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><b><font color="#660000">Levi Pederson</font></b><div><font color="#660000">Mankato Networks LLC</font></div><div><font color="#660000">cell | 612.481.0769</font></div><div><font color="#660000">work | 612.787.7392</font></div><div><a href="mailto:levipederson@mankatonetworks.net" target="_blank">levipederson@mankatonetworks.net</a></div><div><img src="http://www.mankatonetworks.com/images/mn_logo_email.png" width="200" height="21"><br></div></div></div></div></div></div></div></div>
<br><div class="gmail_quote">On Fri, Jun 30, 2017 at 9:13 AM, Barry O'Donovan <span dir="ltr"><<a href="mailto:barry.odonovan@inex.ie" target="_blank">barry.odonovan@inex.ie</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Just run:<br>
<br>
git checkout -- bower.json<br>
<br>
 - Barry<br>
<br>
Levi Pederson wrote:<br>
> All,<br>
><br>
> I'm following the process here.<br>
><br>
> <a href="http://docs.ixpmanager.org/install/upgrading/" rel="noreferrer" target="_blank">http://docs.ixpmanager.org/<wbr>install/upgrading/</a><br>
><br>
> And I've received an error saying, I've modified the bower.json file.<br>
> A file that I am unaware that I changed.<br>
><br>
> git pull<br>
> Updating aa14e99..b3528d0<br>
> error: Your local changes to the following files would be overwritten by<br>
> merge:<br>
>         bower.json<br>
> Please, commit your changes or stash them before you can merge.<br>
> Aborting<br>
><br>
> Does anyone have a recommendation?<br>
><br>
> My install was based on the V4 script several months ago.<br>
><br>
> Thank you in advance,<br>
><br>
> *Levi Pederson*<br>
> Mankato Networks LLC<br>
> cell | <a href="tel:612.481.0769" value="+16124810769">612.481.0769</a><br>
> work | <a href="tel:612.787.7392" value="+16127877392">612.787.7392</a><br>
> <a href="mailto:levipederson@mankatonetworks.net">levipederson@mankatonetworks.<wbr>net</a> <mailto:<a href="mailto:levipederson@mankatonetworks.net">levipederson@<wbr>mankatonetworks.net</a>><br>
><br>
> ______________________________<wbr>_________________<br>
> INEX IXP Manager mailing list<br>
> <a href="mailto:ixpmanager@inex.ie">ixpmanager@inex.ie</a><br>
> <a href="https://www.inex.ie/mailman/listinfo/ixpmanager" rel="noreferrer" target="_blank">https://www.inex.ie/mailman/<wbr>listinfo/ixpmanager</a><br>
<br>
--<br>
<br>
Kind regards,<br>
Barry O'Donovan<br>
INEX Operations<br>
<br>
<a href="https://www.inex.ie/support/" rel="noreferrer" target="_blank">https://www.inex.ie/support/</a><br>
<a href="tel:%2B353%201%20531%203339" value="+35315313339">+353 1 531 3339</a><br>
<br>
<br>
______________________________<wbr>_________________<br>
INEX IXP Manager mailing list<br>
<a href="mailto:ixpmanager@inex.ie">ixpmanager@inex.ie</a><br>
<a href="https://www.inex.ie/mailman/listinfo/ixpmanager" rel="noreferrer" target="_blank">https://www.inex.ie/mailman/<wbr>listinfo/ixpmanager</a><br>
</blockquote></div><br></div>