Merge branch 'upstream'

virtuald · virtuald · commit bb42d9428868 · 2023-03-27T00:08:59.000-04:00
diff --git a/commands2/src/include/frc2/command/WaitCommand.h b/commands2/src/include/frc2/command/WaitCommand.h
@@ -1,4 +1,4 @@
-// Copyright (c) FIRST and other WPILib contributors.
+s// Copyright (c) FIRST and other WPILib contributors.
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) FIRST and other WPILib contributors.`
	`1`	`+s// Copyright (c) FIRST and other WPILib contributors.`
`2`	`2`	`// Open Source Software; you can modify and/or share it under the terms of`
`3`	`3`	`// the WPILib BSD license file in the root directory of this project.`
`4`	`4`