Skip to content

Commit 321fb01

Browse files
committed
Merge pull request kaushikgopal#51 from marukami/code-style
added project code style and cleaned up ignores
2 parents 18f8280 + cbe676f commit 321fb01

File tree

2 files changed

+245
-7
lines changed

2 files changed

+245
-7
lines changed

.gitignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ build/
1515

1616
# Gradle files
1717
.gradle/
18-
build/
1918
subProjects/facebook/build
2019

2120
# Intellij project files
22-
.idea/
21+
.idea/libraries
22+
.idea/.name
23+
.idea/compiler.xml
24+
.idea/gradle.xml
25+
.idea/modules.xml
26+
.idea/runConfigurations.xml
27+
.idea/vcs.xml
2328
.idea/workspace.xml
29+
.idea/misc.xml
2430
gen-external-apklibs/
2531
*.iml
26-
27-
# Intellij
28-
.idea/
29-
*.iml
3032
*.iws
3133

3234
# Local configuration file (sdk path, etc)
@@ -43,4 +45,4 @@ pom.xml.*
4345
#Ant
4446
build.xml
4547
ant.properties
46-
local.properties
48+
profiles_settings.xml

.idea/codeStyleSettings.xml

Lines changed: 236 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)