Skip to content

Instantly share code, notes, and snippets.

@xavierzwirtz

xavierzwirtz/diff

Created April 15, 2015 20:40
Show Gist options
  • Save xavierzwirtz/59a3a42fcac26582081a to your computer and use it in GitHub Desktop.
Save xavierzwirtz/59a3a42fcac26582081a to your computer and use it in GitHub Desktop.
Download ZIP
Raw
diff
<<<<<<< local
Dim m_oItemLocation As IItemLocation '1/6/15 rlz
Dim m_oEntityForm As IEntityForm
Dim m_oEntity As IEntity
||||||| base
=======
Private m_oShipVia As IShipVia '2/18/15 rlz
Private m_oLocation As ILocation '2/18/15 rlz
>>>>>>> other
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment