Skip to content

Commit

Permalink
Merge branch 'main' into feature/131-support-for-tool-dependecies
Browse files Browse the repository at this point in the history
# Conflicts:
#	cli/src/main/java/com/devonfw/tools/ide/tool/LocalToolCommandlet.java
  • Loading branch information
aBega2000 committed Mar 7, 2024
2 parents fbcbf31 + 194a993 commit 0a9b2b5
Show file tree
Hide file tree
Showing 207 changed files with 10,398 additions and 7,392 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
*.log
*.bak
.*
!.gitignore
!.ide.software.version
!.devon.software.version
!.ide
!.anyedit.properties
!.ide.properties
target/
eclipse-target/
generated/
Expand Down
2 changes: 1 addition & 1 deletion .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-Drevision=2024.02.001-alpha-SNAPSHOT
-Drevision=2024.03.001-alpha-SNAPSHOT
Loading

0 comments on commit 0a9b2b5

Please sign in to comment.