diff options
| author | zsloan | 2018-04-13 15:47:42 +0000 |
|---|---|---|
| committer | zsloan | 2018-04-13 15:47:42 +0000 |
| commit | eb24f53d7f5210ead3748772bb4126f78520f32c (patch) | |
| tree | e58268dc13fb494818095021bf5e8510da6f7684 /etc/VERSION | |
| parent | 9276e5eee9be7ed37fda5ea88aec2f1a238864ad (diff) | |
| parent | 270f86c41f7c90cc4ca51bca0aec789a09a36a0e (diff) | |
| download | genenetwork2-eb24f53d7f5210ead3748772bb4126f78520f32c.tar.gz | |
Resolved conflicts for pulling from testing branch
Diffstat (limited to 'etc/VERSION')
| -rw-r--r-- | etc/VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/VERSION b/etc/VERSION index ca9e199c..a4320e6f 100644 --- a/etc/VERSION +++ b/etc/VERSION @@ -1 +1 @@ -2.11-rc1 +2.11-rc2 |