diff options
| author | Antony Woods <acron1@gmail.com> | 2013-10-30 08:38:58 +0000 |
|---|---|---|
| committer | Antony Woods <acron1@gmail.com> | 2013-10-30 08:38:58 +0000 |
| commit | 592f570433a87cee508e30457af58dde4121e705 (patch) | |
| tree | 8f5fdbe7dcb169ea54d1123d97b952de502c5733 /cxx11/c++11-test-nullptr-N2431_fail_compile.cpp | |
| parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
| parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) | |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-nullptr-N2431_fail_compile.cpp')
| -rw-r--r-- | cxx11/c++11-test-nullptr-N2431_fail_compile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cxx11/c++11-test-nullptr-N2431_fail_compile.cpp b/cxx11/c++11-test-nullptr-N2431_fail_compile.cpp index 5747f1b..7ab77a2 100644 --- a/cxx11/c++11-test-nullptr-N2431_fail_compile.cpp +++ b/cxx11/c++11-test-nullptr-N2431_fail_compile.cpp @@ -1,5 +1,5 @@ -int main()
-{
- int i = nullptr;
- return 1;
-}
+int main() +{ + int i = nullptr; + return 1; +} |