diff options
| author | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-11-29 14:52:49 -0700 |
|---|---|---|
| committer | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-11-29 14:52:49 -0700 |
| commit | 30442ed893c4477851d37c865eb978c4bf27c814 (patch) | |
| tree | 406d86f58bcda7ab68affb8c37c6787854338884 /example | |
| parent | 9a014b52ccc22d7ec24804f90993cfe08e3d20c4 (diff) | |
| parent | c1d77f2a231461d88ad493c92079cc571e565f87 (diff) | |
| download | zig-30442ed893c4477851d37c865eb978c4bf27c814.tar.gz zig-30442ed893c4477851d37c865eb978c4bf27c814.zip | |
merge conflicts
Diffstat (limited to 'example')
| -rw-r--r-- | example/math.zig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/example/math.zig b/example/math.zig index aa135426e8..af5b9a706a 100644 --- a/example/math.zig +++ b/example/math.zig @@ -3,4 +3,3 @@ export library "math"; export fn add(a: i32, b: i32) -> i32 { return a + b; } - |