kinda conflict resolution

Former-commit-id: 5280da65bc8b2f8e94a7e15bac215656aefffc40

src/database/psql-entity-framework/model.js

@@ -20,6 +20,11 @@ class Model {
         Logger.Database(`Model ${name} created, with properties: ${JSON.stringify(properties)}`);
     }
 
+    /**
+     * @function property
+     * @description Gets a property from the model
+     * @param {string} name - The name of the target property
+     */
     property(name) {
         if (this.dummy)
         {