diff options
| author | Holger Freyther <zecke@selfish.org> | 2008-04-25 15:01:22 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2008-04-25 15:01:22 +0000 |
| commit | df3bf31812adfe853cdb582058f9209a17c7af84 (patch) | |
| tree | ea4d517adfc394752bc84f8857c5dc89de7c50c8 /conf/machine/wrap.conf | |
| parent | 89f42eccf285d02c3abf815dfa7b1b9a379fd2e5 (diff) | |
Mess with the tree in a unknown way due the limitations of a tool. No idea which
gsmhandset.state to delete (see the below output of mtn), drop both...
mtn: 2 heads on branch 'org.openembedded.dev'
mtn: [left] 3e22c6ee5af012d09e9027c2ade50920300fb0f2
mtn: [right] 74f4e875283dd639a1a426c4ce2930b205f84ac1
mtn: warning: orphaned node conflict on node 24181, dead parent 22904, name gsmhandset.state
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts
Diffstat (limited to 'conf/machine/wrap.conf')
0 files changed, 0 insertions, 0 deletions