Skip to content

Commit 7511e28

Browse files
Merge pull request #375 from linux4life798/dev
Fix syntax in gitattributes and convert CRLF to LF
2 parents bd2ebf3 + 6171317 commit 7511e28

File tree

4 files changed

+60
-48
lines changed

4 files changed

+60
-48
lines changed

.gitattributes

+14-8
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@
88
# in a compressed archive directly from GitHub. (Otherwise class modules may
99
# not be imported correctly. See issue #150 for more details.)
1010
###############################################################################
11-
*.bas text eol=crlf # Most source files use this extension
12-
*.cls text eol=crlf # Class modules
13-
*.xml text eol=crlf # Some object definitions
14-
*.sql text eol=crlf # SQL output
15-
*.frm text eol=crlf # Forms 2.0 form definitions (rarely used)
16-
*.json text eol=crlf # Common source file
11+
# Most source files use this extension
12+
*.bas text eol=crlf
13+
# Class modules
14+
*.cls text eol=crlf
15+
# Some object definitions
16+
*.xml text eol=crlf
17+
# SQL output
18+
*.sql text eol=crlf
19+
# Forms 2.0 form definitions (rarely used)
20+
*.frm text eol=crlf
21+
# Common source file
22+
*.json text eol=crlf
1723

1824
###############################################################################
1925
# Clarify that the source language is VBA (Auto-detection not always accurate)
@@ -24,9 +30,9 @@
2430
*.twin linguist-language=VBA
2531

2632
# Git files
27-
*.gitattributes text
33+
*.gitattributes text
2834
*.gitattributes linguist-language=gitattributes
2935

3036
# Ignore files (like .npmignore or .gitignore)
3137
*.*ignore text
32-
*.*ignore export-ignore
38+
*.*ignore export-ignore

.gitattributes.default

+14-8
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# in a compressed archive directly from GitHub. (Otherwise class modules may
1313
# not be imported correctly. See issue #150 for more details.)
1414
###############################################################################
15-
*.bas text eol=crlf # Most source files use this extension
16-
*.cls text eol=crlf # Class modules
17-
*.xml text eol=crlf # Some object definitions
18-
*.sql text eol=crlf # SQL output
19-
*.frm text eol=crlf # Forms 2.0 form definitions (rarely used)
20-
*.json text eol=crlf # Common source file
15+
# Most source files use this extension
16+
*.bas text eol=crlf
17+
# Class modules
18+
*.cls text eol=crlf
19+
# Some object definitions
20+
*.xml text eol=crlf
21+
# SQL output
22+
*.sql text eol=crlf
23+
# Forms 2.0 form definitions (rarely used)
24+
*.frm text eol=crlf
25+
# Common source file
26+
*.json text eol=crlf
2127

2228
###############################################################################
2329
# Clarify that the source language is VBA (Auto-detection not always accurate)
@@ -28,9 +34,9 @@
2834
*.twin linguist-language=VBA
2935

3036
# Git files
31-
*.gitattributes text
37+
*.gitattributes text
3238
*.gitattributes linguist-language=gitattributes
3339

3440
# Ignore files (like .npmignore or .gitignore)
3541
*.*ignore text
36-
*.*ignore export-ignore
42+
*.*ignore export-ignore

.gitignore

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Version Control Add-in Binaries
2-
# (This should be built from source and not committed to version control)
3-
*.mdb
4-
*.accda
5-
*.accdb
6-
*.zip
7-
8-
# Database lock files
9-
*.laccdb
10-
11-
# Comment out the following line if you wish to include the log files in git.
12-
*.log
13-
14-
# The local VCS index file is paired with the database and should not
15-
# be comitted to version control.
16-
vcs-index.json
1+
# Version Control Add-in Binaries
2+
# (This should be built from source and not committed to version control)
3+
*.mdb
4+
*.accda
5+
*.accdb
6+
*.zip
7+
8+
# Database lock files
9+
*.laccdb
10+
11+
# Comment out the following line if you wish to include the log files in git.
12+
*.log
13+
14+
# The local VCS index file is paired with the database and should not
15+
# be comitted to version control.
16+
vcs-index.json

LICENSE.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
Copyright © 2012 Brendan Kidwell et al
2-
3-
Use of msaccess-vcs-integration and documentation are subject to the following
4-
BSD-style license:
5-
6-
Permission to use, copy, modify, and/or distribute this software for any purpose
7-
with or without fee is hereby granted, provided that the above copyright notice
8-
and this permission notice appear in all copies.
9-
10-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
11-
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
12-
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
13-
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
14-
OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
15-
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
16-
THIS SOFTWARE.
1+
Copyright © 2012 Brendan Kidwell et al
2+
3+
Use of msaccess-vcs-integration and documentation are subject to the following
4+
BSD-style license:
5+
6+
Permission to use, copy, modify, and/or distribute this software for any purpose
7+
with or without fee is hereby granted, provided that the above copyright notice
8+
and this permission notice appear in all copies.
9+
10+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
11+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
12+
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
13+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
14+
OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
15+
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
16+
THIS SOFTWARE.

0 commit comments

Comments
 (0)