diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 18:36:33 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 18:36:33 +0100 |
| commit | 3e6d65fb2180c2a85db01d541c39f491ae63479d (patch) | |
| tree | 23ac302fa75fe794ced257de440356d856050719 /doc/src/declarative | |
| parent | c9b5d8708f0c703122669938573eb575f03d6b78 (diff) | |
Fixed merge conflict in Copyright date.
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/qmlevents.qdoc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/src/declarative/qmlevents.qdoc b/doc/src/declarative/qmlevents.qdoc index 8c2147ac4e..277d8110b6 100644 --- a/doc/src/declarative/qmlevents.qdoc +++ b/doc/src/declarative/qmlevents.qdoc @@ -1,10 +1,6 @@ /**************************************************************************** ** -<<<<<<< HEAD ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -======= -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ->>>>>>> d7a91cfe8683309883694fbbf508e5fc42d44165 ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |