summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewnotecard.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-04-13 20:57:52 -0400
committerOz Linden <oz@lindenlab.com>2012-04-13 20:57:52 -0400
commita56424d0781a07bbf74b9c6cdde5a488a3ba8329 (patch)
tree0ba22dc3ee172365badc0f68397cac4b603077c8 /indra/newview/llpreviewnotecard.cpp
parentf79b775fcc94b1bad6869a6977a5049f356630cc (diff)
fix merge conflict in remove_item
Diffstat (limited to 'indra/newview/llpreviewnotecard.cpp')
0 files changed, 0 insertions, 0 deletions