# Conflicts: # shishikan.txt
@@ -10,7 +10,12 @@
<link href="/css/ionic.app.min.css" rel="stylesheet">
<link href="/css/linker.min.css" rel="stylesheet">
<link href="/css/linker.max.css" rel="stylesheet" color:"blue">
- <link href="/css/linker.first.js" font-sixe:12px>
+ <link href="/css/linker.first.js" background-color:"green" font-sixe:12px>
+<<<<<<< .mine
+
+=======
+>>>>>>> .theirs
