elementary - removed unintended conflicted lines
authorChunEon Park <hermet@hermet.pe.kr>
Mon, 4 Nov 2013 13:19:09 +0000 (22:19 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Mon, 4 Nov 2013 13:19:09 +0000 (22:19 +0900)
commit10b8e9763facff0e2028c9eb64d840f79d8c5c9e
treec5a01500158c6ff470414d14aebb682b90691f1c
parentf0371f458eca8c09da4a790d656881cfabab0338
elementary - removed unintended conflicted lines

that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176
legacy/elementary/NEWS