Fixed merge

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
gazebosim · Nov 11, 2024 · a471f46 · a471f46
1 parent 4afa0fc
commit a471f46
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 584 deletions.
diff --git a/src/RgbdCameraSensor.cc b/src/RgbdCameraSensor.cc
@@ -272,12 +272,8 @@ bool RgbdCameraSensor::CreateCameras()
     return false;
   }
 
-<<<<<<< HEAD
   this->PopulateInfo(cameraSdf);
 
-  int width = cameraSdf->ImageWidth();
-  int height = cameraSdf->ImageHeight();
-=======
   unsigned int width = cameraSdf->ImageWidth();
   unsigned int height = cameraSdf->ImageHeight();
 
@@ -287,7 +283,6 @@ bool RgbdCameraSensor::CreateCameras()
           << std::endl;
     return false;
   }
->>>>>>> aaef365 (Check camera resolution (#480))
 
   this->dataPtr->depthCamera =
       this->Scene()->CreateDepthCamera(this->Name());