Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	IN0009_GBS/dateisysteme.yaml
  • Loading branch information
HendrikHuebner committed Feb 27, 2024
2 parents 3629fa5 + b81a0c6 commit 8ed7931
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion IN0009_GBS/dateisysteme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ cards:
- type: md_basic
id: 35 # (generated)
front: nenne alle bestandteile einer unix festplatten partition
back: |+
- Bootblock
Expand All @@ -317,8 +318,9 @@ cards:
- type: md_basic
id: 36 # (generated)
front: Nenne die bestandteile einer I-Node
back: |+
back: |
- File type
- owner
- user permissions
Expand Down

0 comments on commit 8ed7931

Please sign in to comment.