diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-02-10 10:49:52 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-02-10 10:49:52 -0500 |
| commit | 3747a41fbe290fd5c78c3e849241e3867762bf2c (patch) | |
| tree | afea36c380c866f9119fd6ee18ef9d8b7ce44cfa /docs/.~lock.DesignDocument.docx# | |
| parent | 3898be259999389686c134485df38fa6a3318d7b (diff) | |
| parent | c54aa13522dae9b0d19af50b7cb218c4f7e2407e (diff) | |
Merge branch 'webb' into tkimia
Conflicts:
docs/DesignDocument.docx
docs/DesignDocument.md
Diffstat (limited to 'docs/.~lock.DesignDocument.docx#')
| -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 |