Skip to content

Commit 5196519

Browse files
caojiajuncaojiajun
committed
chore: update gitignore
1 parent 13991a0 commit 5196519

12 files changed

Lines changed: 3 additions & 553 deletions

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ compressed/
3131

3232
/bin/
3333

34-
<<<<<<< HEAD
3534
*.flattened-pom.xml
36-
=======
37-
*.flattened-pom.xml
38-
>>>>>>> v1.3.3
35+
.idea/

‎.idea/.gitignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.idea/aws.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.idea/compiler.xml‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

0 commit comments

Comments
 (0)