From 676e896cdc79b6cd09f1b28d12b0ef66099ecf21 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Wed, 30 Jun 2021 09:22:25 +0200
Subject: [PATCH] resolved conflict with .project

---
 .project | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .project

diff --git a/.project b/.project
new file mode 100644
index 0000000..750e0ef
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gCubeReleaseConfigs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>