Skip to content

add #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thanhphamdt3k5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions STM32 Flash Loader/MainForm.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions STM32 Flash Loader/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,5 +297,14 @@ private void cbPSize_SelectedIndexChanged(object sender, EventArgs e)
}


<<<<<<< Updated upstream
=======
}

private void tbFileName_TextChanged(object sender, EventArgs e)
{

}
>>>>>>> Stashed changes
}
}