NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] developer: remove merge text in chapter 6

Browse Source 
closes odoo/documentation#3351

X-original-commit: a70665ef34
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
This commit is contained in:
fdardenne 2023-01-18 07:28:51 +00:00
parent 9cc91f99e9
commit 906ec0988d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/developer/howtos/discover_js_framework/06_creating_view_from_scratch.rst
View File

@ -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::