diff options
Diffstat (limited to 'demo-script')
| -rw-r--r-- | demo-script | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demo-script b/demo-script index 0c18bf9..58e269a 100644 --- a/demo-script +++ b/demo-script @@ -1,3 +1,4 @@ +<<<<<<< HEAD:demo-script . /t/prompt/prompt test -d demo && rm -rf demo/ test -d ../demo && cd .. && rm -rf demo/ |