Fix merge things

PhotonVision · May 25, 2024 · 029a707 · 029a707
1 parent f0bd3a7
commit 029a707
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/photon-lib/src/main/native/include/PhotonVersion.h b/photon-lib/src/main/native/include/PhotonVersion.h
@@ -27,10 +27,10 @@
 #include <regex>
 #include <string>
 
-namespace photonlib {
+namespace photon {
 namespace PhotonVersion {
 extern const char* versionString;
 extern const char* buildDate;
 extern const bool isRelease;
 }  // namespace PhotonVersion
-}  // namespace photonlib
+}  // namespace photon
diff --git a/photon-lib/src/test/native/cpp/VersionTest.cpp b/photon-lib/src/test/native/cpp/VersionTest.cpp
@@ -28,5 +28,5 @@
 #include "gtest/gtest.h"
 
 TEST(VersionTest, PrintVersion) {
-  std::cout << photonlib::PhotonVersion::versionString << std::endl;
+  std::cout << photon::PhotonVersion::versionString << std::endl;
 }