Commit ca998948 authored by ddkilzer's avatar ddkilzer
Browse files

Remove conflict marker.

git-svn-id: 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 816d9ab0
......@@ -35,7 +35,6 @@
* icon/SQLStatement.cpp:
>>>>>>> .r15260
2006-07-09 Darin Adler <>
- move all but the last 12 files out of kwq directory
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment