Added IAMAI copyright

jonyMarino · jonyMarino · commit 9b079af981a0 · 2025-05-14T13:59:15.000-03:00
diff --git a/docs/development/headless_cloud.md b/docs/development/headless_cloud.md
@@ -1,8 +1,11 @@
 # Running Headless (Docker)
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 {# include enable_internal_docs.tpp #}
 >>>>>>> 9a5cd10 (Modified and updated documentation)
+=======
+>>>>>>> 188d6a7 (Added IAMAI copyright)
 
 ## Using headless mode with VS Code Debugging
 
diff --git a/docs/development/physics/unreal_physics.md b/docs/development/physics/unreal_physics.md
@@ -5,10 +5,16 @@ TODO: How to use Unreal's PhysX to control a drone's physics.
 ---
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 188d6a7 (Added IAMAI copyright)
 Copyright (C) Microsoft Corporation. 
 Copyright (c) 2025 IAMAI Simulations.
 
 MIT License. All rights reserved.
+<<<<<<< HEAD
 =======
 Copyright (C) Microsoft Corporation.  All rights reserved.
 >>>>>>> 9a5cd10 (Modified and updated documentation)
+=======
+>>>>>>> 188d6a7 (Added IAMAI copyright)
diff --git a/docs/development/use_prebuilt.md b/docs/development/use_prebuilt.md
diff --git a/unreal/Blocks/blocks_genprojfiles_vscode.bat b/unreal/Blocks/blocks_genprojfiles_vscode.bat
@@ -1,6 +1,12 @@
 REM Copyright (C) Microsoft Corporation. 
+<<<<<<< HEAD
 REM Copyright (C) IAMAI  Consulting.  
 REM MIT License.
+=======
+Copyright (C) IAMAI  Consulting.  
+
+MIT License.
+>>>>>>> 188d6a7 (Added IAMAI copyright)
 
 @echo off
 if "%UE_ROOT%" == "" (
