Skip to content

Commit 85239b4

Browse files
author
Raven
committed
Fixed merging errors
1 parent 41d654a commit 85239b4

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
2-
<<<<<<< HEAD
31
# Serial Monitor [![Releases](https://badgen.net/github/releases/o7raven/Serialmonitor)](https://github.com/o7raven/SerialMonitor/releases) ![Stars](https://badgen.net/github/stars/o7raven/SerialMonitor) [![Latest](https://badgen.net/github/tag/o7raven/SerialMonitor)](https://github.com/o7raven/SerialMonitor/tags) ![Branches](https://badgen.net/github/branches/o7raven/SerialMonitor) [![MIT License](https://badgen.net/badge/License/MIT/green)](https://choosealicense.com/licenses/mit/)
4-
![CodeSnippet](imgs\codeIntr2.png)
5-
=======
6-
# Serial Monitor ![Releases](https://badgen.net/github/releases/o7raven/Serialmonitor) ![Stars](https://badgen.net/github/stars/o7raven/SerialMonitor) ![Latest](https://badgen.net/github/tag/o7raven/SerialMonitor) ![Branches](https://badgen.net/github/branches/o7raven/SerialMonitor) [![MIT License](https://badgen.net/badge/License/MIT/green)](https://choosealicense.com/licenses/mit/)
72
![CodeSnippet](https://github.com/o7raven/SerialMonitor/blob/main/imgs/codeIntr2.png)
8-
>>>>>>> 3b4c70243fc2becc5ea75cf9c0c33fded7ae9374
9-
103

114
An application that allows you to `send` and `receive` data through `serial ports`.
125

imgs/app-logo.png

-267 KB
Binary file not shown.

0 commit comments

Comments
 (0)