Fixed a merge conflict

2020-12-20 19:27:54 +01:00 · 2020-12-20 19:27:54 +01:00 · 9290bb7154
parent cfe38aab42
commit 9290bb7154
1 changed files with 0 additions and 9 deletions
--- a/src/db/db/dbStreamLayers.h
+++ b/src/db/db/dbStreamLayers.h
@ -253,15 +253,6 @@ public:
   */
  std::set<unsigned int> logical (const db::LayerProperties &p) const;

-  /**
-   *  @brief A compatibility function for future enhancements
-   *  TODO: remove when lefdef branch is merged
-   */
-  std::pair<bool, unsigned int> first_logical (const db::LayerProperties &p) const
-  {
-    return logical (p);
-  }
-
  /**
   *  @brief Query or install a layer mapping from a name or LDPair
   *