summaryrefslogtreecommitdiff
path: root/numpy/doc/constants.py
diff options
context:
space:
mode:
authorGagandeep Singh <gdp.1807@gmail.com>2021-11-02 11:28:17 +0530
committerGagandeep Singh <gdp.1807@gmail.com>2021-11-02 11:28:17 +0530
commitc04509e86e97a69a0b5fcbeebdbec66faad3dbe0 (patch)
treeb5940db3ad46e55b88d566ec058007dc3c6b7e72 /numpy/doc/constants.py
parent56647dd47345a7fd24b4ee8d9d52025fcdc3b9ae (diff)
parentfae6fa47a3cf9b9c64af2f5bd11a3b644b1763d2 (diff)
downloadnumpy-c04509e86e97a69a0b5fcbeebdbec66faad3dbe0.tar.gz
resolved conflicts
Diffstat (limited to 'numpy/doc/constants.py')
-rw-r--r--numpy/doc/constants.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/numpy/doc/constants.py b/numpy/doc/constants.py
index 128493d90..4db5c6390 100644
--- a/numpy/doc/constants.py
+++ b/numpy/doc/constants.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
"""
=========
Constants