Skip to content

Commit 2590cab

Browse files
pamilpamil
authored
Fix .gitignore
1 parent b426c8b commit 2590cab

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎tests/Application/.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
/var/*
44
!/var/.gitkeep
55

6-
<<<<<<< HEAD
7-
/web/
8-
=======
96
/web/*
10-
>>>>>>> 1.0
117
!/web/app.php
128
!/web/app_dev.php
139
!/web/app_test.php

0 commit comments

Comments
 (0)