Update Readme.md

PieroCastillo · Sep 23, 2020 · dd48484 · dd48484
2 parents 2c62d77 + 1cf886f
commit dd48484
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Readme.md b/Readme.md
@@ -39,7 +39,11 @@ Aura.UI
    * TabbedWindow : An optimized window to use with AuraTabItems. 
    * NavigationView : A scrollable MenuItems, like UWP NavigationView.
    * StatusBar : This bar shows an status of application, it will use a class for the status.
+<<<<<<< HEAD
    * WriteablePanel : A panel por represent and edit images easily. 
+=======
+   * WritteablePanel : A panel that represents and edits images easily. 
+>>>>>>> 1cf886f59f5f943fbe23604ae60af7cedf69b3ba
 
 * UI Extensions
    * TabControlExtensions: