[FIX] developer: remove merge text in chapter 6

X-original-commit: a70665ef34
2026-01-04 10:46:04 +07:00 · 2023-01-18 13:17:25 +01:00
1 changed files with 0 additions and 8 deletions
--- a/content/developer/howtos/discover_js_framework/06_creating_view_from_scratch.rst
+++ b/content/developer/howtos/discover_js_framework/06_creating_view_from_scratch.rst
@@ -41,15 +41,7 @@ addon includes the necessary server files to add a new view.
 1. Make a hello world view
 ==========================

-<<<<<<< HEAD
-<<<<<<< HEAD
 First step is to create a JavaScript implementation with a simple component.
-=======
-First step is to create a javascript implementation with a simple component.
->>>>>>> 953fca3a ([IMP] developer: JavaScript tutorial: chapter 6)
-=======
-The first step is to create a JavaScript implementation with a simple component.
->>>>>>> e1a22ec3 (review chapter 6)

 .. exercise::