forked from mrlan/EnglishPal
				
			
				
					
						
							# Conflicts: # app/static/js/fillword.js # app/static/js/highlight.js  | 
			||
|---|---|---|
| .. | ||
| checkboxes.js | ||
| fillword.js | ||
| highlight.js | ||
| jquery.js | ||
| read.js | ||
| word_operation.js | ||
				
					
						
							# Conflicts: # app/static/js/fillword.js # app/static/js/highlight.js  | 
			||
|---|---|---|
| .. | ||
| checkboxes.js | ||
| fillword.js | ||
| highlight.js | ||
| jquery.js | ||
| read.js | ||
| word_operation.js | ||