From 906ec0988d64fba0bbc02deb3e5d879570cbc706 Mon Sep 17 00:00:00 2001 From: fdardenne Date: Wed, 18 Jan 2023 07:28:51 +0000 Subject: [PATCH] [FIX] developer: remove merge text in chapter 6 closes odoo/documentation#3351 X-original-commit: a70665ef345555aa4334d65137a6123cded0d341 Signed-off-by: Antoine Vandevenne (anv) --- .../06_creating_view_from_scratch.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git 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 index 43fb6785f..4252eb3cd 100644 --- 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::