summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorxue <>2006-02-03 07:06:11 +0000
committerxue <>2006-02-03 07:06:11 +0000
commitbaac41fc1e52c2902feabf778915195042b196b0 (patch)
treeda665febbd2a2faa320c9659cea243f323a4672c /.gitattributes
parent0efe2d3e9e02ada6fe297af823b90fa967de85df (diff)
Fixed an issue about style merging.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
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