diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-04-27 14:58:09 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-04-27 14:58:09 +0200 |
| commit | 0d7629db63d3360c824983eb44ffb2c05116b996 (patch) | |
| tree | 6b84c528b42ca5fe28f9225060a82b1f3f2a6548 /aa-server.yaml | |
| parent | ec547d50dafcff127521908370225b76df5f741a (diff) | |
| parent | 4d32162313c574c908ce87723ad4fb900e690a08 (diff) | |
Resolved conflicts
Diffstat (limited to 'aa-server.yaml')
| -rw-r--r-- | aa-server.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/aa-server.yaml b/aa-server.yaml index ebfd667..c01c1ed 100644 --- a/aa-server.yaml +++ b/aa-server.yaml @@ -34,5 +34,4 @@ - "http://SERVERNAME/dataset" - "http://SERVERNAME/model" - "http://SERVERNAME/validation" - - !ruby/regexp /http\:\/\/ESCAPEDSERVE\/validation\/[a-z,A-Z,\/,_\-]*$/ - + - !ruby/regexp /http\:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ |