Newfeature - #1378

Open

makky0816 wants to merge 18 commits into

D-S-Hub:mainfrom

makky0816:newfeature

Commits on Jul 31, 2026

add newfile
makky0816
committed
e60ba23

Commits on Aug 1, 2026

change name
makky0816
committed
4e74496
changed name agein
makky0816
committed
271377e
make new file
makky0816
committed
e2b22e2
delete file
makky0816
committed
f8dfe0d
new file
makky0816
committed
a5422ad
add gitignore
makky0816
committed
b9aa8b0

Commits on Aug 2, 2026

update readme
makky0816
committed
738736a

Commits on Aug 3, 2026

make new file for automatic merge
makky0816
committed
412f3ef
update readme on conflict branch for conflict
makky0816
committed
b5655c0
update readme on main for conflict
makky0816
committed
b8ead80
resolve conflict
makky0816
committed
841fc3f

Commits on Aug 4, 2026

Update README to reflect changes on GitHub
makky0816
authored
0f6aa10
Update README to reflect second GitHub for coflict
makky0816
authored
6a34aa7
update readme on conflict-remote for conflict
makky0816
committed
f903fc0
update resolve conflict
makky0816
committed
7502042
Merge pull request #1 from makky0816/conflict-remote
makky0816
authored
f93b8c6
update readme at my repo
makky0816
committed
8554104