<html><body>
<p><font size="2" face="sans-serif">That did it!</font><br>
<br>
<font size="2" face="sans-serif">Thanks!</font><br>
<br>
<br>
<font size="2" face="sans-serif">Kersten J. Richter<br>
Software Engineer<br>
IBM, Rochester<br>
Home office: 952-652-5304<br>
<br>
If you lend someone $20 and never see that person again, it was probably worth it.</font><br>
<br>
<img width="16" height="16" src="cid:1__=09BBF69DDFFE27BC8f9e8a93df938@us.ibm.com" border="0" alt="Inactive hide details for Diane Fleming ---10/24/2013 02:15:59 PM---Look at this file to see if it has merge conflicts: opensta"><font size="2" color="#424282" face="sans-serif">Diane Fleming ---10/24/2013 02:15:59 PM---Look at this file to see if it has merge conflicts: openstack-object-storage-dev/ch_object-api-gener</font><br>
<br>
<font size="1" color="#5F5F5F" face="sans-serif">From: </font><font size="1" face="sans-serif">Diane Fleming <diane.fleming@rackspace.com></font><br>
<font size="1" color="#5F5F5F" face="sans-serif">To: </font><font size="1" face="sans-serif">Kersten J Richter/Rochester/IBM@IBMUS, </font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Cc: </font><font size="1" face="sans-serif">"openstack-docs@lists.openstack.org" <openstack-docs@lists.openstack.org></font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Date: </font><font size="1" face="sans-serif">10/24/2013 02:15 PM</font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Subject: </font><font size="1" face="sans-serif">Re: [Openstack-docs] resolving git review conflicts</font><br>
<hr width="100%" size="2" align="left" noshade style="color:#8091A5; "><br>
<br>
<br>
<font size="2" face="Calibri">Look at this file to see if it has merge conflicts:</font><br>
<br>
<font size="3" face="Calibri">openstack-object-storage-dev/ch_object-api-general.xml</font><br>
<br>
<font size="3" face="Calibri">If it does, resolve them and then</font><br>
<br>
<font size="3" face="Calibri">git add .</font><br>
<font size="3" face="Calibri">git rebase —continue</font><br>
<br>
<font size="3" face="Calibri">git review –v</font><br>
<br>
<br>
<font size="2" face="serif"><i>Diane</i></font><br>
<font size="2" face="Calibri"><i>----------------------------------------------</i></font><br>
<font size="2" face="Calibri">Diane Fleming</font><br>
<font size="2" face="Calibri">Software Developer II - US</font><br>
<font size="2" face="Calibri">diane.fleming@rackspace.com</font><br>
<font size="2" face="Calibri">Cell 512.323.6799</font><br>
<font size="2" face="Calibri">Office 512.874.1260</font><br>
<font size="2" face="Calibri">Skype drfleming0227</font><br>
<font size="2" face="Calibri">Google-plus diane.fleming@gmail.com</font><br>
<br>
<font size="2" face="Calibri"><b>From: </b></font><font size="2" face="Calibri">Kersten J Richter <</font><a href="mailto:kersten@us.ibm.com"><font size="2" color="#0000FF" face="Calibri"><u>kersten@us.ibm.com</u></font></a><font size="2" face="Calibri">></font><font size="2" face="Calibri"><b><br>
Date: </b></font><font size="2" face="Calibri">Thursday, October 24, 2013 2:13 PM</font><font size="2" face="Calibri"><b><br>
To: </b></font><font size="2" face="Calibri">Diane Fleming <</font><a href="mailto:diane.fleming@rackspace.com"><font size="2" color="#0000FF" face="Calibri"><u>diane.fleming@rackspace.com</u></font></a><font size="2" face="Calibri">></font><font size="2" face="Calibri"><b><br>
Cc: </b></font><font size="2" face="Calibri">"</font><a href="mailto:openstack-docs@lists.openstack.org"><font size="2" color="#0000FF" face="Calibri"><u>openstack-docs@lists.openstack.org</u></font></a><font size="2" face="Calibri">" <</font><a href="mailto:openstack-docs@lists.openstack.org"><font size="2" color="#0000FF" face="Calibri"><u>openstack-docs@lists.openstack.org</u></font></a><font size="2" face="Calibri">></font><font size="2" face="Calibri"><b><br>
Subject: </b></font><font size="2" face="Calibri">Re: [Openstack-docs] resolving git review conflicts</font><br>
<br>
<font size="2" face="Calibri">openstack-object-storage-dev/ch_object-api-general.xml</font><font size="3" face="Calibri"> </font><br>
</body></html>