aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
diff options
context:
space:
mode:
authorBlueWall2012-10-09 07:59:44 -0400
committerBlueWall2012-10-09 07:59:44 -0400
commit92849c5cc39bb6d83c478c300ba10fab9d7f8bfc (patch)
treecae6c3bfa72ae356e726850039ac7559af94a8db /OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
parentMerge branch 'master' into connector_plugin (diff)
downloadopensim-SC_OLD-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.zip
opensim-SC_OLD-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.tar.gz
opensim-SC_OLD-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.tar.bz2
opensim-SC_OLD-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.tar.xz
missed some conflict markup
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs')
0 files changed, 0 insertions, 0 deletions