diff options
| author | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-12-01 10:44:30 -0700 |
|---|---|---|
| committer | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-12-01 10:44:30 -0700 |
| commit | ab327344b671bff7f874f24691d7e3f19176167c (patch) | |
| tree | c437760bbc1f7059417b21e37c3d15a42534d4e8 /example/multiple_files/foo.zig | |
| parent | 9278dbedd5242bf4253da29c0fab36eea9dda61b (diff) | |
| parent | dfb6682089ad758b7ba72733778a9aa8c544c164 (diff) | |
| download | zig-ab327344b671bff7f874f24691d7e3f19176167c.tar.gz zig-ab327344b671bff7f874f24691d7e3f19176167c.zip | |
merge conflicts
Diffstat (limited to 'example/multiple_files/foo.zig')
| -rw-r--r-- | example/multiple_files/foo.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/example/multiple_files/foo.zig b/example/multiple_files/foo.zig index a42e58397c..021bf71e5b 100644 --- a/example/multiple_files/foo.zig +++ b/example/multiple_files/foo.zig @@ -6,6 +6,6 @@ fn private_function() { puts("it works!"); } -fn print_text() { +pub fn print_text() { private_function(); } |
