Merge "Remove unused conditional in TextController" into devel/master

author HyunJu Shin <hyunjushin@samsung.com>

Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)
author HyunJu Shin <hyunjushin@samsung.com>
Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	HyunJu Shin <hyunjushin@samsung.com>
	Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)