-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
AtomicPages LLC
committed
Jul 27, 2014
1 parent
0e3dd7c
commit 075646e
Showing
1 changed file
with
0 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,5 @@ | ||
| .sass-cache | ||
| <<<<<<< HEAD | ||
| compass/css | ||
| sass/css | ||
| coverage | ||
| InstalledFiles | ||
| lib/bundler/man | ||
| pkg | ||
| rdoc | ||
| spec/reports | ||
| test/tmp | ||
| test/version_tmp | ||
| tmp | ||
| TODO.md | ||
|
|
||
| # YARD artifacts | ||
| .yardoc | ||
| _yardoc | ||
| doc/ | ||
| ======= | ||
| *.config.scss | ||
| skeleton.* | ||
| skeleton_template.css | ||
| *.html | ||
| >>>>>>> 2.x |