diff options
author | xue <> | 2006-02-03 07:06:11 +0000 |
---|---|---|
committer | xue <> | 2006-02-03 07:06:11 +0000 |
commit | baac41fc1e52c2902feabf778915195042b196b0 (patch) | |
tree | da665febbd2a2faa320c9659cea243f323a4672c /.gitattributes | |
parent | 0efe2d3e9e02ada6fe297af823b90fa967de85df (diff) |
Fixed an issue about style merging.
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 0072ea5e..fa25de82 100644 --- a/.gitattributes +++ b/.gitattributes @@ -118,6 +118,8 @@ demos/quickstart/protected/pages/Controls/Samples/TCustomValidator/Home.page -te demos/quickstart/protected/pages/Controls/Samples/TCustomValidator/Home.php -text demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample1.page -text demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample1.php -text +demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.page -text +demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.php -text demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample1.page -text demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample1.php -text demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page -text |