Resolved conflicts

wet-boew · Sep 16, 2012 · b1d8b91 · b1d8b91
2 parents f4fc190 + 0660036
commit b1d8b91
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/build/js/css/pe-ap-ie-min.css b/build/js/css/pe-ap-ie-min.css
diff --git a/build/js/css/pe-ap-min.css b/build/js/css/pe-ap-min.css
diff --git a/demos/zebra/rowlevelwithsummary.html b/demos/zebra/rowlevelwithsummary.html
@@ -717,7 +717,7 @@ <h1 id="wb-cont">Row level with summary Table - Zebra striping - Web Experience
 
 <div class="module-note span-6 margin-top-large">
 <p><strong>Note:</strong></p>
-<p>For that kind of table, the recommandation is to use the technique <a href="http://www.w3.org/TR/2010/NOTE-WCAG20-TECHS-20101014/H43">H43: Using id and headers attributes to associate data cells with header cells in data tables</a>. A short way to assign id/headers is to use the <a href="../../docs/tableparser/validator-htmltable.html">HTML Table Validator</a>.</p>
+<p>For that kind of table, the recommandation is to use the technique <a href="http://www.w3.org/TR/2010/NOTE-WCAG20-TECHS-20101014/H43">H43: Using id and headers attributes to associate data cells with header cells in data tables</a>. A short way to assign id/headers is to use the <a href="../tableparser/validator-htmltable.html">HTML Table Validator</a>.</p>
 </div>
 
 

diff --git a/docs/index-fra.html b/docs/index-fra.html
@@ -116,7 +116,7 @@ <h1 id="wb-cont">Boîte à outils de l’expérience Web (BOEW)</h1>
 
 <section><h2>Ressources clés</h2>
 <ul>
-<li><a href="../Licence-eng.txt">Conditions régissant l'utilisation</a></li>
+<li><a href="../Licence-fra.txt">Conditions régissant l'utilisation</a></li>
 <li><a href="../demos/index-fra.html">Exemples pratiques</a></li>
 </ul>
 </section>

diff --git a/src/js/sass/sessiontimeout.scss b/src/js/sass/sessiontimeout.scss
@@ -17,5 +17,5 @@
 	-khtml-opacity: 0.9;
 	/* Good browsers */
 	opacity: 0.9;
-	background-image: url(scrim.png);
+	background-image: url(../images/sessiontimeout/scrim.png);
 }