[dali_1.3.25] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / text-controls / text-editor-devel.cpp

diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp
index 875e270..97ee0fa 100755 (executable)
--- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp
@@ -1,8 +1,5 @@
-#ifndef DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H
-#define DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H
-
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +37,4 @@ InputMethodContext GetInputMethodContext( TextEditor textEditor )
 
 } // namespace Toolkit
 
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H
+} // namespace Dali
\ No newline at end of file