From 82eff654696ca1fbca912d7aba6c9b0934234f47 Mon Sep 17 00:00:00 2001
From: rojas <rojas@N619>
Date: Wed, 11 Sep 2024 11:33:07 -0700
Subject: [PATCH] Merge origin/master

Conflicts:
	examples/nbproject/project.properties
---
 examples/src/ViskitOpenDis7Examples/viskitProject.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/src/ViskitOpenDis7Examples/viskitProject.xml b/examples/src/ViskitOpenDis7Examples/viskitProject.xml
index dceef140ca..16ae0dd6c2 100644
--- a/examples/src/ViskitOpenDis7Examples/viskitProject.xml
+++ b/examples/src/ViskitOpenDis7Examples/viskitProject.xml
@@ -9,7 +9,4 @@
   </BuildDirectory>
   <DistDirectory name="dist" />
   <LibDirectory name="lib" />
-  <Cached />
-  <extraClassPaths>
-  </extraClassPaths>
 </ViskitProject>
-- 
GitLab