From 3b82817d91b64c93b10d0f17f91aa81eadaea777 Mon Sep 17 00:00:00 2001 From: sladecraven Date: Thu, 12 Nov 2020 14:44:42 +0100 Subject: [PATCH] =?UTF-8?q?#11=20gestion=20encombrement=20et=20malus=20ass?= =?UTF-8?q?oci=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/rdd-utility.js | 5 +---- system.json | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 64fccf30..9a027254 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -162,9 +162,8 @@ export class RdDUtility { return loadTemplates(templatePaths); } -<<<<<<< HEAD - /************************************************************************************/ + /* -------------------------------------------- */ static buildConteneur( objet, niveau ) { if (!niveau) niveau = 1; let prefix = ""; @@ -212,8 +211,6 @@ export class RdDUtility { } return tableRes; } -======= ->>>>>>> fb52e394e7e17fad20a0bdaa2ae9ea00c03a465e /* -------------------------------------------- */ static getLevelCategory( ) diff --git a/system.json b/system.json index 3343ce64..4046ead6 100644 --- a/system.json +++ b/system.json @@ -5,7 +5,7 @@ "version": "0.9.32", "minimumCoreVersion": "0.7.5", "compatibleCoreVersion": "0.7.6", - "templateVersion": 43, + "templateVersion": 44, "author": "LeRatierBretonnien", "esmodules": [ "module/rdd-main.js", "module/hook-renderChatLog.js" ], "styles": ["styles/simple.css"],