minor conflict between upstream and local

diff --cc README.xwidget
index c4674df007955f39626e27ffb87357161e9d2abb,6637d0d0252600f6e1265948824417391d21a6a6..fa3f9dabfde0e1dff2c55d819bbf3bb4fc356f43
--- 1/README.xwidget
--- 2/README.xwidget
+++ b/README.xwidget
@@@ -1558,8 -1558,5 +1558,8 @@@ when an xwidget is removed from xwidget
  references(mostly views) the xwidget should be garbage collected.
  
  special finalization would go into gc_sweep()
 -
 -test
++<<<<<<< TREE
 +** TODO embedding evince
 +http://developer.gnome.org/libevview/3.2/libevview-ev-view.html
 +would be useful for reading PDF:s and other document types.
- 
 +it would work the same way webkit embedding works.