diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Data/MySQL/MySQLFSAssetData.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLFSAssetData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLFSAssetData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs index 4ed2de6..2837ce3 100644 --- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Data.MySQL | |||
| 54 | { | 54 | { |
| 55 | get { return GetType().Assembly; } | 55 | get { return GetType().Assembly; } |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | public MySQLFSAssetData() | 58 | public MySQLFSAssetData() |
| 59 | { | 59 | { |
| 60 | } | 60 | } |