diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-05 10:47:12 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-05 10:47:12 (GMT) |
| commit | c196394ce305a7343cc5f51f166b76746f9d9903 (patch) | |
| tree | 3a486805412e80d4cdf26a434859436abdaccf73 /doc/src/declarative | |
| parent | 55d05512939b8e7a43f22a1cc423112d8fb3d2eb (diff) | |
| download | Qt-c196394ce305a7343cc5f51f166b76746f9d9903.zip Qt-c196394ce305a7343cc5f51f166b76746f9d9903.tar.gz Qt-c196394ce305a7343cc5f51f166b76746f9d9903.tar.bz2 | |
Fixed merge conflict
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/anchor-layout.qdoc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 70381de..11acbad 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -28,14 +28,10 @@ /*! \page qml-anchor-layout.html \target anchor-layout -<<<<<<< HEAD \contentspage QML Features \previouspage {Using QML Positioner and Repeater Items}{Component Layouts} \nextpage {QML Mouse Events}{Mouse Events} \title Anchor-based Layout in QML -======= -\title Anchor-Based Layout in QML ->>>>>>> f44f7084a3020ed8e249644d5b5e07f74cb7b070 \section1 Overview |