Fakultas Ilmu Komputer UI

Commit d6a46f55 authored by Al Taaj Kautsar Supangkat's avatar Al Taaj Kautsar Supangkat
Browse files

resolve merge conflict

parents 21b9a4a1 dd6b1f35
<changelist name="Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]" date="1622958227789" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Checkout at 06/06/21 12.43 [Default Changelist]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/6.8/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/fileHashes.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/classes/java/test/Softeng/Group3/SiJadwal/repository/UserListTest.class" />
<option name="AFTER_PATH" />
<option name="SHELVED_PATH" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/test-results/test/binary/results.bin" />
<option name="AFTER_PATH" value="build/test-results/test/binary/results.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/results.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/javaCompile/classAnalysis.bin" />
<option name="AFTER_PATH" value=".gradle/6.8/javaCompile/classAnalysis.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/classAnalysis.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/classes/java/test/Softeng/Group3/SiJadwal/model/CourseTest.class" />
<option name="AFTER_PATH" />
<option name="SHELVED_PATH" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/6.8/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/javaCompile/jarAnalysis.bin" />
<option name="AFTER_PATH" value=".gradle/6.8/javaCompile/jarAnalysis.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/jarAnalysis.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/classes/java/test/Softeng/Group3/SiJadwal/model/AssignmentTest.class" />
<option name="AFTER_PATH" />
<option name="SHELVED_PATH" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/javaCompile/javaCompile.lock" />
<option name="AFTER_PATH" value=".gradle/6.8/javaCompile/javaCompile.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/javaCompile.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/6.8/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/executionHistory.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/test-results/test/binary/output.bin" />
<option name="AFTER_PATH" value="build/test-results/test/binary/output.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/output.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/javaCompile/taskHistory.bin" />
<option name="AFTER_PATH" value=".gradle/6.8/javaCompile/taskHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/taskHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/6.8/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/test-results/test/binary/output.bin.idx" />
<option name="AFTER_PATH" value="build/test-results/test/binary/output.bin.idx" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/output.bin.idx" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/classes/java/main/Softeng/Group3/SiJadwal/repository/TimetableList.class" />
<option name="AFTER_PATH" value="build/classes/java/main/Softeng/Group3/SiJadwal/repository/TimetableList.class" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/TimetableList.class" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/classes/java/test/Softeng/Group3/SiJadwal/model/TimetableTest.class" />
<option name="AFTER_PATH" />
<option name="SHELVED_PATH" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/6.8/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/6.8/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_06_06_21_12_43_[Default_Changelist]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value="build/jacoco/test.exec" />
<option name="AFTER_PATH" />
<option name="SHELVED_PATH" />
</binary>
</changelist>
\ No newline at end of file
[![pipeline status](https://gitlab.cs.ui.ac.id/softeng-group-3/weekly-planner/badges/master/pipeline.svg)](https://gitlab.cs.ui.ac.id/softeng-group-3/weekly-planner/-/commits/master)
[![coverage report](https://gitlab.cs.ui.ac.id/softeng-group-3/weekly-planner/badges/master/coverage.svg)](https://gitlab.cs.ui.ac.id/softeng-group-3/weekly-planner/-/commits/master)
# Readme File
## Work Breakdown Structure
......
......@@ -23,19 +23,16 @@ orang,table,rpl,adpro
student,name,rpl,adpro
orang,name,rpl,adpro
student,name,rpl,adpro
student,tb,rpl
student,name,rpl
student,tb1,rpl,adpro
orang,tb3,rpl,adpro
st,tb1,rpl,adpro
student,tb2,rpl,adpro
orang,tb3,rpl,adpro
student,tb1,rpl
st,tb2,rpl
orang,tb3,rpl
st,name,rpl
st,name,rpl
st,name,rpl
null,A
st,re,rpl,daa
st,re,rpl,adpro
st,rere,rpl,daa
st,rere,rpl,daa
st,hola,rpl
st,re,rpl,adpro
st,name,rpl,adpro
st,name,rpl,adpro
st,name,rpl
st,name,rpl
st,name,rpl,adpro
st,name,rpl
No preview for this file type
Supports Markdown
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