diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /graphics/interface/ball/timer.pal | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'graphics/interface/ball/timer.pal')
| -rw-r--r-- | graphics/interface/ball/timer.pal | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/interface/ball/timer.pal b/graphics/interface/ball/timer.pal deleted file mode 100644 index e0c23569e..000000000 --- a/graphics/interface/ball/timer.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -172 0 0 -197 49 41 -222 98 82 -255 156 123 -255 255 255 -148 148 148 -65 65 65 -24 24 24 -180 180 180 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -0 0 0 |
