bulatova_karina/PIbd-22_Bulatova_K.R._WarmlyShip._HARD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22. Bulatova K.R. LabWork_01 HARD #1

Closed
bulatova_karina wants to merge 4 commits from LabWork_01 into master
pull from: LabWork_01
merge into: bulatova_karina:master
Conversation 0 Commits 4 Files Changed 14 +11 -11
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cdc497da5a - Show all commits

22
.idea/workspace.xml
View File

@ -4,15 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="1966194d-7a0e-41b7-8248-e72d6d03a650" name="Changes" comment="Создание проекта">
<change afterPath="$PROJECT_DIR$/src/CountDecks.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Direction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/DrawingDecks.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/EntityShip.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/FormWarmlyShip.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
</list>
<list default="true" id="1966194d-7a0e-41b7-8248-e72d6d03a650" name="Changes" comment="full 1 laba" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -62,11 +54,19 @@
<option name="project" value="LOCAL" />
<updated>1700585393019</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="full 1 laba">
<created>1702066529328</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1702066529328</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Создание проекта" />
<option name="LAST_COMMIT_MESSAGE" value="Создание проекта" />
<MESSAGE value="full 1 laba" />
<option name="LAST_COMMIT_MESSAGE" value="full 1 laba" />
</component>
</project>