diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-01-05 21:42:56 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-01-05 21:42:56 +0100 |
| commit | d2fce291b535ab5f36c8cc6e4bd9648373e39ef8 (patch) | |
| tree | 710f9d767fd6fbb35d89cd2ec2b150fb5f3fc53e /mediagoblin/static/css/extlib/text.css | |
| parent | 34b4090cbf1f6ea62b9127f0ac96e748ad22b668 (diff) | |
| parent | 7df9f45c32d7fd2ae5ae6c137ebf96437f764323 (diff) | |
| download | mediagoblin-d2fce291b535ab5f36c8cc6e4bd9648373e39ef8.tar.lz mediagoblin-d2fce291b535ab5f36c8cc6e4bd9648373e39ef8.tar.xz mediagoblin-d2fce291b535ab5f36c8cc6e4bd9648373e39ef8.zip | |
Fix merge conflicts
Diffstat (limited to 'mediagoblin/static/css/extlib/text.css')
| l--------- | mediagoblin/static/css/extlib/text.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mediagoblin/static/css/extlib/text.css b/mediagoblin/static/css/extlib/text.css deleted file mode 120000 index 2d864de4..00000000 --- a/mediagoblin/static/css/extlib/text.css +++ /dev/null @@ -1 +0,0 @@ -../../../../extlib/960.gs/text.css
\ No newline at end of file |