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-static_assert-N1720.cpp | |
parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-static_assert-N1720.cpp')
-rw-r--r-- | cxx11/c++11-test-static_assert-N1720.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cxx11/c++11-test-static_assert-N1720.cpp b/cxx11/c++11-test-static_assert-N1720.cpp index eae3c9a..c3d74ca 100644 --- a/cxx11/c++11-test-static_assert-N1720.cpp +++ b/cxx11/c++11-test-static_assert-N1720.cpp @@ -1,5 +1,5 @@ -int main()
-{
- static_assert(0 < 1, "your ordering of integers is screwed");
- return 0;
-}
+int main() +{ + static_assert(0 < 1, "your ordering of integers is screwed"); + return 0; +} |