From f2ef2339f4f86bc901ba03932960829d51c6c25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wilko=C5=84?= Date: Thu, 16 May 2024 09:11:16 +0200 Subject: [PATCH] Update terminal.c git conflict markers removal --- Core/Src/terminal.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Core/Src/terminal.c b/Core/Src/terminal.c index 1e9fc1e..e037ad6 100644 --- a/Core/Src/terminal.c +++ b/Core/Src/terminal.c @@ -1,11 +1,7 @@ /* Copyright 2020-2023 Piotr Wilkon -<<<<<<< HEAD:Core/Src/terminal.c -This file is part of VP-DigiConfig. -======= This file is part of VP-Digi. ->>>>>>> e9a5ebd2c6fc83adbfacb614029274ed01491d16:Src/terminal.c VP-Digi is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by