fucked up git
This commit is contained in:
		
						commit
						d328a53a93
					
				
					 2 changed files with 8 additions and 0 deletions
				
			
		
							
								
								
									
										4
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							|  | @ -1,4 +1,8 @@ | ||||||
| .DS_Store | .DS_Store | ||||||
| /bin | /bin | ||||||
| interface.external.css | interface.external.css | ||||||
|  | <<<<<<< HEAD | ||||||
| jquery.js | jquery.js | ||||||
|  | ======= | ||||||
|  | jquery.css | ||||||
|  | >>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e | ||||||
|  |  | ||||||
|  | @ -1,5 +1,9 @@ | ||||||
| # External GUI Libraries | # External GUI Libraries | ||||||
| are not included in this repository for the sake of providing authors' credit. Moreover, it's recommended to get the latest versions for as long as they do not break. | are not included in this repository for the sake of providing authors' credit. Moreover, it's recommended to get the latest versions for as long as they do not break. | ||||||
| 
 | 
 | ||||||
|  | <<<<<<< HEAD | ||||||
| Please choose one; they're exactly the same, but you'll have to rename them as `interface.external.css`. | Please choose one; they're exactly the same, but you'll have to rename them as `interface.external.css`. | ||||||
|  | ======= | ||||||
|  | Please choose one; they're exactly the same, but you'll have to rename them as `interface.css`.  | ||||||
|  | >>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e | ||||||
| - [ ] [7.css](https://khang-nd.github.io/7.css/) | - [ ] [7.css](https://khang-nd.github.io/7.css/) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue