diff options
| author | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
|---|---|---|
| committer | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
| commit | 6440348618ade4fbcb541c40473074833a47d198 (patch) | |
| tree | 537ab7e4f0af7deba51bbfb360fe490968d651f8 /template/butt.st | |
| parent | 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff) | |
| parent | 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff) | |
fixing merge conflicts
Diffstat (limited to 'template/butt.st')
| -rw-r--r-- | template/butt.st | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/template/butt.st b/template/butt.st new file mode 100644 index 0000000..b14df64 --- /dev/null +++ b/template/butt.st @@ -0,0 +1 @@ +Hi |