Merge 399559e0b7 into 7247090aa6

Merge pull request #4811 from foxtrottNB/patch-1
Add ignore rule for TwinCAT Measurement files
2026-08-30 03:37:05 +02:00 · 2026-04-16 20:27:53 +00:00 · 2026-04-16 09:42:29 -07:00 · 2026-03-12 15:27:47 +01:00 · 2026-01-25 15:33:17 -06:00
2 changed files with 5 additions and 0 deletions
--- a/Python.gitignore
+++ b/Python.gitignore
@ -200,6 +200,8 @@ cython_debug/
 #   and can be added to the global gitignore or merged into this file. However, if you prefer, 
 #   you could uncomment the following to ignore the entire vscode folder
 # .vscode/
 # Temporary file for partial code execution
 tempCodeRunnerFile.py
 # Ruff stuff:
 .ruff_cache/
--- a/TwinCAT3.gitignore
+++ b/TwinCAT3.gitignore
@ -55,3 +55,6 @@ LineIDs.dbg.bak
 *.~u
 *.project.~u
 *.suo
 # TwinCAT Measurement
 *.vsm
Author	SHA1	Message	Date
kailando	7558170346	Merge `399559e0b7` into `7247090aa6`	2026-04-16 20:27:53 +00:00
Devin Dooley	7247090aa6	Merge pull request #4811 from foxtrottNB/patch-1 Add ignore rule for TwinCAT Measurement files	2026-04-16 09:42:29 -07:00
foxtrottNB	6836b38f62	Add ignore rule for TwinCAT Measurement files	2026-03-12 15:27:47 +01:00
kailando	399559e0b7	Resolve merge conflicts for PR #4300	2026-01-25 15:33:17 -06:00