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

충돌 해결

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

4
INT69DB_2A/Version.txt
View File

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