diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-01-11 18:08:18 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-01-18 17:38:19 +0100 |
| commit | 1e0d1aa8c53e305adff87e7cc16a7aff0f7cfdec (patch) | |
| tree | ccd20ddd99c00dd00e400371ada4e250ccb081fe | |
| parent | 6fc763cb20a02f56363e93279ada4a4f8e5a11f3 (diff) | |
Fix mismerge
Change-Id: If098e716d33cefc3e0f174c89f749a07b38f3658
| -rw-r--r-- | sal/osl/w32/signal.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 2f6b9cc96506..45ff0ab58f6e 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -147,6 +147,4 @@ long WINAPI signalHandlerFunction(LPEXCEPTION_POINTERS lpEP) } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |