audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[WIP]pms: conflicts resolved

Browse Source
This commit is contained in:
braisab
2021-03-09 12:47:49 +01:00
parent 28077b696b
commit 80232417a0
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pms/views/reservation_portal_templates.xml
View File

@@ -1,8 +1,4 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8" ?>
=======
<?xml version="1.0" encoding="utf-8"?>
>>>>>>> 9ae89adeafb12af5dbb27cdd270f5cf1fed9b2f1
<odoo>
<template
id="portal_my_home_menu_reservation"