Skip to content

Commit

Permalink
Merge pull request #1 from cathrkri/cath_branch
Browse files Browse the repository at this point in the history
test: test of the new branch
  • Loading branch information
cathrkri authored Jan 11, 2026
2 parents ba087e9 + da6292e commit e4ceaac
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

*.idea
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# systemutviklingTeam6
# systemutviklingTeam6

initial project creation
9 changes: 9 additions & 0 deletions systemutviklingTeam6.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

0 comments on commit e4ceaac

Please sign in to comment.