Skip to content

Commit

Permalink
- added comments and sprint conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelfolaron committed Jun 24, 2024
1 parent ee7dd09 commit ced1094
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
11 changes: 10 additions & 1 deletion app/Core/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,18 @@ class Application extends Container
*/
protected $deferredServices = [];

/**
* Array to store laravel service providers
*
* @var array
*/
protected $serviceProviders = [];

/**
* Array to store already loaded providers
*
* @var array
*/
protected $loadedProviders = [];

/**
Expand All @@ -51,7 +61,6 @@ class Application extends Container
*/
protected $booted = false;


/**
* Constructor method for the class.
*
Expand Down
5 changes: 3 additions & 2 deletions app/Domain/Sprints/Templates/sprintdialog.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
<?php
if(isset($currentSprint)) {
if($currentSprint->projectId == $project['id']) {
echo "selected";
}else if( session("currentProject") == $project['id']){
echo "selected";
}
}elseif( session("currentProject") == $project['id']){
echo "selected";
}
?>
Expand Down

0 comments on commit ced1094

Please sign in to comment.