From 76fbb4a69bf64f33ebe290c7132bbdab4c0311bc Mon Sep 17 00:00:00 2001 From: gitea Date: Tue, 4 Mar 2025 21:50:29 +0000 Subject: [PATCH] fix conflict issue --- inventory/services.py | 4 ++-- templates/header.html | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/inventory/services.py b/inventory/services.py index c203d874..8023cce4 100644 --- a/inventory/services.py +++ b/inventory/services.py @@ -43,8 +43,8 @@ def decodevin(vin): return result elif result:=elm(vin): return result - # elif result:=decode_vin_haikalna(vin): - # return result + elif result:=decode_vin_haikalna(vin): + return result else: return None diff --git a/templates/header.html b/templates/header.html index 64ad7c99..48aec9ae 100644 --- a/templates/header.html +++ b/templates/header.html @@ -3,11 +3,9 @@ {% if user.is_authenticated %}