search

GUEDDES / swqp

Automatically exported from code.google.com/p/swqp
0 stars 0 forks source link

merge charactistics (we can do this one together if that's best) #21

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
/Users/apseyed/Documents/rpi/semantaqua/facets/semantaqua-characteristics-facet$
 svn commit -m "characteristics"
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: 
'/Users/apseyed/Documents/rpi/semantaqua/facets/semantaqua-characteristics-facet
/src/main/java/edu/rpi/tw/escience/characteristics/CharacteristicsModule.java' 
remains in conflict

Original issue reported on code.google.com by apse...@gmail.com on 28 Nov 2012 at 2:46

GoogleCodeExporter commented 9 years ago

Original comment by apse...@gmail.com on 28 Nov 2012 at 6:32