Viewing all changes in revision 1035.
- Committer: Olivier Tilloy
- Date: 2015-04-24 16:22:20 UTC
- Revision ID: olivier.tilloy@canonical.com-20150424162220-cnjuzxa9c80j5p9n
Remove merge conflict leftover.
- files modified:
- qt/qmlplugin/oxide_qml_plugin.cc
expand all
collapse all
added
removed
