archive/saviour-backup-system
Archived
1
Fork 0
Code Releases Packages Activity

removed merge conflict

Browse source
This commit is contained in:
Jake Howard 2015-03-29 18:08:39 +01:00
parent 5e97df6bf7
commit 54d7df317e
1 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Paper Work/To-Do List.txt
View file

@ -4,39 +4,14 @@ From Diane Feedback:
Move technical documentation algorithm screenshots to end (to make bigger!) Move technical documentation algorithm screenshots to end (to make bigger!)
Technical algorithms into IPSO processes Technical algorithms into IPSO processes
<<<<<<< HEAD
Order:
Contents
Analysis
IPSO Chart
Screen Designs
Testing
Technial Documentation
User Documentation
Appraisal
=======
Technical Documentation:
Add more important code sections
Testing Log:
Add evidence of testing (Another document maybe?)
Test more of the objectives
Edit Footers! Done:
Anaysis
Testing
Appraisal
IPSO Chart
Techincal Documentation
User Documentation
Order: Order:
Contents Contents
Analysis 1-6 Analysis 1-6
IPSO Chart 7 IPSO Chart 7
Screen Designs
Testing 8-9 Testing 8-9
Techincal Documentation 10-16 Techincal Documentation 10-16
User Documentation 17-18 User Documentation 17-18
Appraial 19-21 Appraial 19-21
>>>>>>> b0e75a394013b9474d03a716e2084dc98be19d67