chojy
/
INT69DB_2A
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

충돌 해결

master
CJY 2025-12-18 14:50:39 +09:00
parent ffb25ee7a9
commit 0d3d429d8a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INT69DB_2A/Version.txt
View File

@ -15,6 +15,7 @@
멀티형 2~6열 스틱 계량기 멀티형 2~6열 스틱 계량기
*/ */
<<<<<<< HEAD
@ Ver 6.6.0 by CJY @ Ver 6.6.0 by CJY
- 2025.09.29 - 2025.09.29
- Ver 6.5.0 Modify - Ver 6.5.0 Modify
@ -69,6 +70,8 @@
temp = 12 -> 20 수정 temp = 12 -> 20 수정
속도 데이터가 추가 되어있다고함(실제로는 -99990000 이거만 수신됨..) 속도 데이터가 추가 되어있다고함(실제로는 -99990000 이거만 수신됨..)
=======
>>>>>>> 875d61f (@ Ver 6.1.0 by LSJ)
@ Ver 6.1.0 by LSJ @ Ver 6.1.0 by LSJ
- 2024.12.05 - 2024.12.05
- Ver 6.0.0 Modify - Ver 6.0.0 Modify