summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMichael Ball <cycomachead@gmail.com>2014-02-04 11:59:45 -0800
committerMichael Ball <cycomachead@gmail.com>2014-02-04 11:59:45 -0800
commit817f4c5420e5d55409c88386c478f14e4735a627 (patch)
tree29af845c58934508a0ea842786c5838e8deb4519 /README.md
parent9aa3921dd04ee8b6fedec0116f9e3f5503e4043b (diff)
parent8b5fa2ff9bd81ad9227b2593f9ccd6fdb8d32444 (diff)
downloadsnap-byow-817f4c5420e5d55409c88386c478f14e4735a627.tar.gz
snap-byow-817f4c5420e5d55409c88386c478f14e4735a627.zip
resolve merge conflicts; date problems only
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 8564d27..cf17e18 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ inspired by Scratch
written by Jens Mönig and Brian Harvey
jens@moenig.org, bh@cs.berkeley.edu
-Copyright (C) 2013 by Jens Mönig and Brian Harvey
+Copyright (C) 2014 by Jens Mönig and Brian Harvey
Snap! is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as