Skip to content

Instantly share code, notes, and snippets.

@seeb

seeb/gist:5549472

Created May 9, 2013 18:27
Show Gist options
  • Save seeb/5549472 to your computer and use it in GitHub Desktop.
Save seeb/5549472 to your computer and use it in GitHub Desktop.
Download ZIP
merge 809
Raw
gistfile1.txt
sburt@USNUX009:~/ambra$ git merge origin/dev/FEND-809
Auto-merging webapp/src/main/webapp/css/global.css
Auto-merging base/src/main/resources/articleTransform-v3.xsl
Merge made by the 'recursive' strategy.
base/src/main/resources/articleTransform-v3.xsl | 5 +++++
webapp/src/main/webapp/css/global.css | 6 ++++++
2 files changed, 11 insertions(+)
sburt@USNUX009:~/ambra$ git push origin release/2.6.3rc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment