bitte verwendet nur noch addressen die https beginnen! Siehe wiki https://wiki.mediacube.at/wiki/index.php?title=Repositories#ssh-_vs._https_repository_adressen

alle von MMT haben hier Zugriff. Du willst Deine Freunde von MMA auch dabei haben? Mail mit den usernamen an Brigitte Jellinek

Commit 368c6c3c authored by Christoph Mayr's avatar Christoph Mayr

json

parent 9617aa91
......@@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="03703853-d797-498e-a74c-c726d51baed3" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.js" afterPath="$PROJECT_DIR$/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/minijson.json" afterPath="$PROJECT_DIR$/minijson.json" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -17,7 +16,7 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="563">
......@@ -40,18 +39,18 @@
<file leaf-file-name="pokemon.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pokemon.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="225">
<caret line="86" column="46" lean-forward="false" selection-start-line="86" selection-start-column="40" selection-end-line="86" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="minijson.json" pinned="false" current-in-tab="false">
<file leaf-file-name="minijson.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/minijson.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<state relative-caret-position="45">
<caret line="3" column="111" lean-forward="false" selection-start-line="3" selection-start-column="111" selection-end-line="3" selection-end-column="111" />
<folding />
</state>
</provider>
......@@ -88,8 +87,8 @@
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/pokemon.json" />
<option value="$PROJECT_DIR$/minijson.json" />
<option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/minijson.json" />
</list>
</option>
</component>
......@@ -170,12 +169,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1528804284204</updated>
<workItem from="1528804285428" duration="4260000" />
<workItem from="1528804285428" duration="4480000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4260000" />
<option name="totallyTimeSpent" value="4480000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="877" extended-state="0" />
......@@ -227,34 +226,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pokemon.json">
<entry file="file://$PROJECT_DIR$/pokemoncopy.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="135">
<caret line="9" column="5" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="9" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pokemoncopy.json">
<entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="5" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="9" selection-end-column="5" />
<state relative-caret-position="563">
<caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/minijson.json">
<entry file="file://$PROJECT_DIR$/pokemon.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<state relative-caret-position="225">
<caret line="86" column="46" lean-forward="false" selection-start-line="86" selection-start-column="40" selection-end-line="86" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.js">
<entry file="file://$PROJECT_DIR$/minijson.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="563">
<caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
<state relative-caret-position="45">
<caret line="3" column="111" lean-forward="false" selection-start-line="3" selection-start-column="111" selection-end-line="3" selection-end-column="111" />
<folding />
</state>
</provider>
......
[
{"number":"001", "name": "Bulbasaur", "generation": "Generation I", "about": "Bulbasaur can be seen napping in bright sunlight. There is a seed on its back. By soaking up the sun's rays, the seed grows progressively larger.", "types": ["Grass","Poison"]}
,
{"number": "002", "name": "Ivysaur", "generation": "Generation I", "about": "There is a bud on this Pokemon's back. To support its weight, Ivysaur's legs and trunk grow thick and strong. If it starts spending more time lying in the sunlight, it's a sign that the bud will bloom into a large flower soon.", "types": ["Grass","Poison"]}
{"number": "002", "name": "Ivysaur", "generation": "Generation I", "about": "There is a bud on this Pok\u00e9mon's back. To support its weight, Ivysaur's legs and trunk grow thick and strong. If it starts spending more time lying in the sunlight, it's a sign that the bud will bloom into a large flower soon.", "types": ["Grass","Poison"]}
,
{"number": "003", "name": "Venusaur", "generation": "Generation I", "about": "There is a large flower on Venusaur's back. The flower is said to take on vivid colors if it gets plenty of nutrition and sunlight. The flower's aroma soothes the emotions of people.", "types": ["Grass","Poison"]}
]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment