RENCI / xDCIShare

xDCIShare is a collaborative website being developed for better access to data and models of scientific domains. xDCIShare is derived directly from the NSF-funded HydroShare codebase.
https://www.xdcishare.org
BSD 3-Clause "New" or "Revised" License
0 stars 1 forks source link

Commented out other resource types leaving only Collection, Composite… #41

Closed cbcunc closed 7 years ago

cbcunc commented 7 years ago

…, and Generic.

cbcunc commented 7 years ago

For some reason there was a merge conflict on the last line. Suspect end of file marker, but didn't show up in the conflict editor. Fixed anyway.

hyi commented 7 years ago

@cbcunc @mjstealey @rayi113 I am wondering whether we need composite resource type if we don't have other resource types since composite resource type is just a mixture of different resource types?