Removed conflict markers.
authorMattia Barbon <mbarbon@cpan.org>
Sun, 13 Apr 2003 14:07:51 +0000 (14:07 +0000)
committerMattia Barbon <mbarbon@cpan.org>
Sun, 13 Apr 2003 14:07:51 +0000 (14:07 +0000)
commita968cb805f628842f16909454a15a81333020ece
tree569aedfbd6351f4bb662bb410d3573999c5f9a94
parent13c13ecbbf6a920c737ec0d3604278f544b83192
  Removed conflict markers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/motif/app.cpp