diff options
Diffstat (limited to 'ext/session/tests/CONFLICTS')
| -rw-r--r-- | ext/session/tests/CONFLICTS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/session/tests/CONFLICTS b/ext/session/tests/CONFLICTS deleted file mode 100644 index 30888ae480..0000000000 --- a/ext/session/tests/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -session |