From 698f0f04e0281fd348319a154baa41fb9a46f39c Mon Sep 17 00:00:00 2001
From: Heggiehog <nizcat5@gmail.com>
Date: Sun, 3 Dec 2023 15:14:57 -0800
Subject: [PATCH] merge errors

---
 src/main/java/frc/robot/Commands/IntakeCommand.java         | 4 ++--
 .../java/frc/robot/Commands/StopIntakeMotorCommand.java     | 4 ++--
 src/main/java/frc/robot/RobotContainer.java                 | 6 +++---
 src/main/java/frc/robot/Subsystems/IntakeSubsystem.java     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/frc/robot/Commands/IntakeCommand.java b/src/main/java/frc/robot/Commands/IntakeCommand.java
index 96e7410..bd18856 100644
--- a/src/main/java/frc/robot/Commands/IntakeCommand.java
+++ b/src/main/java/frc/robot/Commands/IntakeCommand.java
@@ -2,11 +2,11 @@
 // 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.
 
-package frc.robot.Commands;
+package frc.robot.commands;
 
 import edu.wpi.first.wpilibj2.command.CommandBase;
 import frc.robot.Constants;
-import frc.robot.Subsystems.IntakeSubsystem;
+import frc.robot.subsystems.IntakeSubsystem;
 
 public class IntakeCommand extends CommandBase {
 
diff --git a/src/main/java/frc/robot/Commands/StopIntakeMotorCommand.java b/src/main/java/frc/robot/Commands/StopIntakeMotorCommand.java
index 5c5b61b..c0b34fb 100644
--- a/src/main/java/frc/robot/Commands/StopIntakeMotorCommand.java
+++ b/src/main/java/frc/robot/Commands/StopIntakeMotorCommand.java
@@ -2,10 +2,10 @@
 // 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.
 
-package frc.robot.Commands;
+package frc.robot.commands;
 
 import edu.wpi.first.wpilibj2.command.CommandBase;
-import frc.robot.Subsystems.IntakeSubsystem;
+import frc.robot.subsystems.IntakeSubsystem;
 
 public class StopIntakeMotorCommand extends CommandBase {
   IntakeSubsystem intakeSubsystem;
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index c498e95..d6e3938 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -4,9 +4,9 @@
 
 package frc.robot;
 
-import frc.robot.Subsystems.IntakeSubsystem;
-import frc.robot.Commands.StopIntakeMotorCommand;
-import frc.robot.Commands.IntakeCommand;
+import frc.robot.subsystems.IntakeSubsystem;
+import frc.robot.commands.StopIntakeMotorCommand;
+import frc.robot.commands.IntakeCommand;
 import edu.wpi.first.wpilibj.GenericHID;
 import edu.wpi.first.wpilibj.XboxController;
 import edu.wpi.first.wpilibj2.command.InstantCommand;
diff --git a/src/main/java/frc/robot/Subsystems/IntakeSubsystem.java b/src/main/java/frc/robot/Subsystems/IntakeSubsystem.java
index f5077cf..c88d067 100644
--- a/src/main/java/frc/robot/Subsystems/IntakeSubsystem.java
+++ b/src/main/java/frc/robot/Subsystems/IntakeSubsystem.java
@@ -2,7 +2,7 @@
 // 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.
 
-package frc.robot.Subsystems;
+package frc.robot.subsystems;
 
 import com.ctre.phoenix.motorcontrol.NeutralMode;
 import com.ctre.phoenix.motorcontrol.TalonFXControlMode;