Skip to content

Commit 2e858a3

Browse files
committed
Merge branch 'feat/defer-exercises'
2 parents 94fd4b3 + 0c2ccde commit 2e858a3

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

internal/exercises/catalog.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ concepts:
134134
test_regex: ".*"
135135
hints:
136136
- Define a custom error type and return it from a function.
137+
<<<<<<< HEAD
137138
- slug: 37_xml
138139
title: XML Encoding and Decoding
139140
test_regex: ".*"
@@ -142,6 +143,13 @@ concepts:
142143
- Add XML struct tags using `xml:"fieldname"` to map struct fields to XML elements.
143144
- Use xml.Marshal to convert structs to XML bytes.
144145
- Use xml.Unmarshal to parse XML bytes into structs.
146+
=======
147+
- slug: 28_defer
148+
title: Deferred Execution
149+
test_regex: ".*"
150+
hints:
151+
- Close the file using `defer` keyword with f.Close().
152+
>>>>>>> feat/defer-exercises
145153

146154
projects:
147155
- slug: 101_text_analyzer

0 commit comments

Comments
 (0)