summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authortkimia <tkimia@purdue.edu>2014-02-10 10:40:36 -0500
committertkimia <tkimia@purdue.edu>2014-02-10 10:40:36 -0500
commit0696a3e5d75f901a1d74565b9efa37c39e8d13bc (patch)
tree64c31255054243d225110d4e07d1863c66e8773c /docs
parentf64de0958583d3972390b6f43d8b8eb8e026da65 (diff)
parent2c9640b00d0de74fce98a5af511b7b08784b24b3 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts: docs/DesignDocument.docx
Diffstat (limited to 'docs')
-rw-r--r--docs/.~lock.DesignDocument.docx#1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/.~lock.DesignDocument.docx# b/docs/.~lock.DesignDocument.docx#
new file mode 100644
index 0000000..50859f6
--- /dev/null
+++ b/docs/.~lock.DesignDocument.docx#
@@ -0,0 +1 @@
+Davis ,amelia,Amelia,10.02.2014 10:30,file:///home/amelia/.config/libreoffice/3; \ No newline at end of file