Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix merge conflict

  • Loading branch information...
commit da3b3525e5bd51b093ac3376b0660b8f6ef088f0 2 parents 5bc04e5 + 5e1fcea
Joe Marty mltsy authored
Showing with 6 additions and 1 deletion.
  1. +6 −1 README
7 README
View
@@ -3,5 +3,10 @@ Garden Dating Project
An app/site to match gardners with gardens in Austin, TX
+=======
+List of current gardens
+Maps of current gardens
+
Contributors:
-Jor Marty
+Joe Marty
+
Please sign in to comment.
Something went wrong with that request. Please try again.