Merge "[Multimedia] Updated the doc-comments to fix the grammar errors."

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / public / Layer.cs

diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs
index 165b170..f4aaa35 100755 (executable)
--- a/src/Tizen.NUI/src/public/Layer.cs
+++ b/src/Tizen.NUI/src/public/Layer.cs
@@ -94,8 +94,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        ///
-
         protected override void Dispose(DisposeTypes type)
         {
             if(disposed)
@@ -431,8 +429,6 @@ namespace Tizen.NUI
                 SetProperty(View.Property.VISIBLE, new Tizen.NUI.PropertyValue(value));
             }
         }
-<<<<<<< HEAD
-=======
 
         /// <summary>
         /// Get the number of children held by the layer.
@@ -477,6 +473,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
->>>>>>> parent of a941a95... Revert "[Tizen] add Name in Layer, LineCount in TextLabel"
+
     }
 }