From c196394ce305a7343cc5f51f166b76746f9d9903 Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@nokia.com>
Date: Wed, 5 Jan 2011 11:47:12 +0100
Subject: Fixed merge conflict

---
 doc/src/declarative/anchor-layout.qdoc | 4 ----
 1 file changed, 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
 
-- 
cgit v0.12