| @@ -100,33 +100,16 ENV/ | |||
|
|
100 | 100 | # eclipse |
|
|
101 | 101 | .project |
|
|
102 | 102 | .pydevproject |
|
|
103 | <<<<<<< HEAD | |
|
|
104 | <<<<<<< HEAD | |
|
|
105 | ======= | |
|
|
106 | >>>>>>> v2.3 | |
|
|
107 | ||
|
|
108 | 103 | # vscode |
|
|
109 | 104 | |
|
|
110 | 105 | .vscode |
|
|
111 | 106 | |
|
|
112 | 107 | schaingui/node_modules/ |
|
|
113 | 108 | schainpy/scripts/ |
|
|
114 | <<<<<<< HEAD | |
|
|
115 | ======= | |
|
|
116 | 109 | .svn/ |
|
|
117 | 110 | *.png |
|
|
118 | 111 | *.pyc |
|
|
119 | 112 | schainpy/scripts |
|
|
120 | 113 | .vscode |
|
|
121 | schaingui/node_modules | |
|
|
122 | 114 | trash |
|
|
123 | >>>>>>> master | |
|
|
124 | ======= | |
|
|
125 | schaingui/node_modules/ | |
|
|
126 | .svn/ | |
|
|
127 | *.png | |
|
|
128 | *.pyc | |
|
|
129 | *.xml | |
|
|
130 | 115 | *.log |
|
|
131 | trash | |
|
|
132 | >>>>>>> v2.3 | |
General Comments 0
You need to be logged in to leave comments.
Login now