diff options
Diffstat (limited to 'doc/src/declarative/anchor-layout.qdoc')
| -rw-r--r-- | doc/src/declarative/anchor-layout.qdoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 11acbad..70381de 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -28,10 +28,14 @@ /*! \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 |