[oe-commits] org.oe.dreambox merge: resolve orphaned node conflict

[tmbinc commit]

merge: resolve orphaned node conflict

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 52dfcd4e8a176e28df32baa61ee5584aa8d4c9c6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=52dfcd4e8a176e28df32baa61ee5584aa8d4c9c6
Files:
1
packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
Diffs:

#
# mt diff -raa70f35e12bec75c0c43f7c69c41e959b5d83092 -r52dfcd4e8a176e28df32baa61ee5584aa8d4c9c6
#
# 
# 
# delete "packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch"
#