Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>

ChangeLog

@@ -24,6 +24,8 @@ phpMyAdmin - ChangeLog
 - bug #4223 Database list: Create database misses collation column
 - bug #4224 Empty table names when a table is "inuse"
 - bug #4225 Partition maintenance broken
+- bug #4219 Table list (left panel) does not reload when table renamed
+- bug #4230 "in use" displayed for all views in database print view
 
 4.1.4.0 (2014-01-07)
 - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times

db_printview.php

@@ -94,7 +94,9 @@ if ($num_tables == 0) {
             } // end if
         } else {
             echo '<td colspan="3" class="center">';
-            echo __('in use');
+            if (! PMA_Table::isView($db, $sts_data['TABLE_NAME'])) {
+                echo __('in use');
+            }
             echo '</td>';
         }
         echo '<td>';