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