Merge a85a4c2ffd 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:36:39 +00:00 · 2026-04-16 09:42:29 -07:00 · 2026-03-12 15:27:47 +01:00 · 2026-01-21 14:43:36 +01:00
2 changed files with 7 additions and 4 deletions
--- a/Python.gitignore
+++ b/Python.gitignore
@ -195,10 +195,10 @@ cython_debug/
 .abstra/
 # Visual Studio Code
-#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore that
-#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, you
-#   you could uncomment the following to ignore the entire vscode folder
+#   could uncomment the following to ignore the entire vscode folder
 # .vscode/
 # Ruff stuff:
--- a/TwinCAT3.gitignore
+++ b/TwinCAT3.gitignore
@ -55,3 +55,6 @@ LineIDs.dbg.bak
 *.~u
 *.project.~u
 *.suo
 # TwinCAT Measurement
 *.vsm
Author	SHA1	Message	Date
Rubén Pérez Alonso	83e26fb23d	Merge `a85a4c2ffd` into `7247090aa6`	2026-04-16 20:36:39 +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
Rubén Pérez Alonso	a85a4c2ffd	Remove trailing spaces and rewrap to 100 columns Removed 2 trailing spaces and rewrapped the surrounding paragraph to 100 columns, consistent with the rest of the file.	2026-01-21 14:43:36 +01:00