diff options
| author | Андрей Гущин <saintruler@gmail.com> | 2019-06-06 10:01:55 +0300 |
|---|---|---|
| committer | Андрей Гущин <saintruler@gmail.com> | 2019-06-06 10:01:55 +0300 |
| commit | a650fbdf426ba40e93dd86f1f40aac3ac5164534 (patch) | |
| tree | 6bda60939a95dbfc47a3b7cff987b1934fce8fb7 | |
| parent | 33f6717e4252d3f729bdb0ea7769f8488ae70d60 (diff) | |
| parent | cfbe90dc5b6d146761f4ebb43ae9d833a2c25d4f (diff) | |
Merge branch 'day3_task3' into 'master'
День 3, задача 3
See merge request saintruler/trainee!15
| -rw-r--r-- | day3/task3/task2.json | 17 | ||||
| -rw-r--r-- | day3/task3/task2.xml | 16 | ||||
| -rw-r--r-- | day3/task3/task2.yaml | 10 |
3 files changed, 43 insertions, 0 deletions
diff --git a/day3/task3/task2.json b/day3/task3/task2.json new file mode 100644 index 0000000..6ba9ee3 --- /dev/null +++ b/day3/task3/task2.json @@ -0,0 +1,17 @@ +[ + { + "name": "blini", + "ingredient" : { + "milk": 500, + "egs" : 2, + "flour" : 200, + "sugar" : 2 + } + }, + { + "name": "fried eggs", + "ingredient": { + "egs": 3 + } + } +]
\ No newline at end of file diff --git a/day3/task3/task2.xml b/day3/task3/task2.xml new file mode 100644 index 0000000..ba343a1 --- /dev/null +++ b/day3/task3/task2.xml @@ -0,0 +1,16 @@ +<?xml version="1.1" encoding="UTF-8"?> +<meals> + <meal name="blini"> + <ingridients> + <ingridient name="milk" amount="500"/> + <ingridient name="egs" amount="2"/> + <ingridient name="flour" amount="200"/> + <ingridient name="sugar" amount="2"/> + </ingridients> + </meal> + <meal name="fried eggs"> + <ingridients> + <ingridient name="egs" amount="3"/> + </ingridients> + </meal> +</meals>
\ No newline at end of file diff --git a/day3/task3/task2.yaml b/day3/task3/task2.yaml new file mode 100644 index 0000000..42c9c6b --- /dev/null +++ b/day3/task3/task2.yaml @@ -0,0 +1,10 @@ +- name: blini + ingridient: + milk: 500 + egs: 2 + flour: 200 + sugar: 2 + +- name: fried eggs + ingridient: + egs: 3
\ No newline at end of file |