Browse Source

Update terminal.c

git conflict markers removal
pull/41/head
Piotr Wilkoń 2 years ago
committed by GitHub
parent
commit
f2ef2339f4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 4 deletions
  1. +0
    -4
      Core/Src/terminal.c

+ 0
- 4
Core/Src/terminal.c View File

@ -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


Loading…
Cancel
Save