Skip to content
No description or website provided.
PHP
Find file
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Failed to load latest commit information.
.sass-cache
classes
images
js
src
stylesheets
.gitignore
.gitignore.txt
README
archive.php
editproject.php
edittask.php
edituser.php
footer.php
header.php
index - Copy.php
index.php
login.php
logout.php
newproject.php
newtask.php
newuser.php
projects.php
register.php
tasks.php
users.php

README

<<<<<<< HEAD
<<<<<<< HEAD
Tom made a change - AGAIN!!!


Making yet another change>>>>>>>
=======
=======
>>>>>>> design
<<<<<<< HEAD
Making changes.....to this file
=======
Tom made a change - AGAIN!!!

Dave's change
>>>>>>> d55f7dc5f51cda1098f5be28f9848f7e2d9e5cce



--Melissa is making a change HERE

Bree is teh shiznit
<<<<<<< HEAD
>>>>>>> d90e0bebce6a030555a4a7bdfb093ea735aa1abc
=======
=======
Tom made a change - AGAIN!!!


Making yet another change>>>>>>>
>>>>>>> b04a343139495e74c8ec7ccd0c8d6414c1d4dd38
>>>>>>> design
Something went wrong with that request. Please try again.