Merge branch 'dev-intake' of https://github.com/Floofyer/321-Crescend…

…o-2024 into dev-intake
RoboLancers · Jan 24, 2024 · 493e858 · 493e858
2 parents 9f3d8b1 + 61e5548
commit 493e858
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -104,7 +104,7 @@ spotless {
     java {
         target fileTree('.') {
             include '**/*.java'
-            exclude '**/build/**', '**/build-*/**'
+            exclude '**/build/**', '**/build-*/**','**/BuildConstants.java'
         }
         toggleOffOn()
         googleJavaFormat().reflowLongStrings()
@@ -148,7 +148,7 @@ spotless {
     format 'misc', {
         target fileTree('.') {
             include '**/*.md', '**/.gitignore'
-            exclude '**/build/**', '**/build-*/**'
+            exclude '**/build/**', '**/build-*/**', '**/BuildConstants.java'
         }
         trimTrailingWhitespace()
         indentWithSpaces(2)

diff --git a/src/main/java/org/robolancers321/BuildConstants.java b/src/main/java/org/robolancers321/BuildConstants.java
@@ -7,13 +7,21 @@ public final class BuildConstants {
   public static final String MAVEN_GROUP = "";
   public static final String MAVEN_NAME = "321-Crescendo-2024";
   public static final String VERSION = "unspecified";
+<<<<<<< HEAD
   public static final int GIT_REVISION = 9;
   public static final String GIT_SHA = "d7f5a071320caae2dbf837f6d4b8063c990ef911";
   public static final String GIT_DATE = "2024-01-24 17:03:30 EST";
+=======
+
+  public static final int GIT_REVISION = 6;
+  public static final String GIT_SHA = "6377635d69d5713f8f8b5400fc7a136abe5c431e";
+  public static final String GIT_DATE = "2024-01-21 18:36:14 EST";
+>>>>>>> 61e5548f8a28f491003a4d55329b23a68f4bb910
   public static final String GIT_BRANCH = "dev-intake";
   public static final String BUILD_DATE = "2024-01-24 17:22:28 EST";
   public static final long BUILD_UNIX_TIME = 1706134948601L;
   public static final int DIRTY = 0;
 
+
   private BuildConstants(){}
 }