--- a/accept-language.inc	Thu Oct 11 00:48:46 2012 +0200
+++ b/accept-language.inc	Thu Oct 11 00:54:54 2012 +0200
@@ -1,7 +1,23 @@
 <?php
+<<<<<<< local
 class Language {
   function acceptedLanguages() {
     $langs = array();
+=======
+/**
+ * @file
+ * Functionality for determining language use
+ */
+
+/**
+ * Extracts the accepted languages from the GET query, sorted by
+ * preference(q-value).
+ *
+ * @return associative array of language codes with q value
+ */
+function acceptedLanguages() {
+  $langs = array();
+>>>>>>> other
 
     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
       // break up string into pieces (languages and q factors)